From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
basic-server/src/main/java/com/ruoyi/basic/excel/StructureTestObjectData.java | 25 +++++++++++++++++++++++++
1 files changed, 25 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
new file mode 100644
index 0000000..4fc2fd2
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/basic/excel/StructureTestObjectData.java
@@ -0,0 +1,25 @@
+package com.ruoyi.basic.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+@Data
+public class StructureTestObjectData {
+ @ExcelProperty(value = "鍦烘墍")
+ private String laboratory;
+
+ @ExcelProperty(value = "妫�娴嬪璞�")
+ private String specimenName;
+
+ @ExcelProperty(value = "妫�娴嬪璞�(EN)")
+ private String specimenNameEn;
+
+ @ExcelProperty(value = "瀵硅薄浠e彿")
+ private String code;
+
+ @ExcelProperty(value = "浜у搧鍚嶇О")
+ private String name;
+
+ @ExcelProperty(value = "浜у搧鍚嶇О(EN)")
+ private String nameEn;
+}
--
Gitblit v1.9.3