From b999398ae9b2719d2db15716dd353f7a3855d59e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 07 四月 2025 17:33:55 +0800
Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency
---
basic-server/src/main/java/com/ruoyi/basic/excel/StructureTestObjectData.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/excel/StructureTestObjectData.java b/basic-server/src/main/java/com/ruoyi/basic/excel/StructureTestObjectData.java
index 4fc2fd2..59174b8 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/excel/StructureTestObjectData.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/excel/StructureTestObjectData.java
@@ -1,6 +1,7 @@
package com.ruoyi.basic.excel;
import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@@ -22,4 +23,13 @@
@ExcelProperty(value = "浜у搧鍚嶇О(EN)")
private String nameEn;
+
+ @ExcelProperty(value = "瀵硅薄绫诲瀷")
+ private String objectType;
+
+ @ExcelProperty(value = "杞﹂棿鍚嶇Оid")
+ private Integer workShopId;
+
+ @ExcelProperty(value = "杞﹂棿鍚嶇О")
+ private String workShopName;
}
--
Gitblit v1.9.3