From 641f7bb8b2d2e23f1f5192fecf030a567151c7b5 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 15 七月 2025 17:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs
---
src/main/java/com/zy/asrs/importexcle/ImportOrderDto.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/importexcle/ImportOrderDto.java b/src/main/java/com/zy/asrs/importexcle/ImportOrderDto.java
index 8395d76..0356161 100644
--- a/src/main/java/com/zy/asrs/importexcle/ImportOrderDto.java
+++ b/src/main/java/com/zy/asrs/importexcle/ImportOrderDto.java
@@ -11,10 +11,18 @@
@Data
public class ImportOrderDto {
- @ExcelProperty(value = "鍖呰缁勫彿",index = 0)
+ @ExcelProperty(value = "鍖呰缁勫彿/婧愬簱浣�",index = 0)
private String column1;
- @ExcelProperty(value = "鍑哄簱鍗曞彿/鍗曟嵁绫诲瀷",index = 1)
+ @ExcelProperty(value = "鍑哄簱鍗曞彿/鍗曟嵁绫诲瀷/瀹㈡埛鍚嶇О/澶囨敞/鐩爣搴撲綅",index = 1)
private String column2;
+ @ExcelProperty(value = "鐩爣宸烽亾/瀹㈡埛鍚嶇О",index = 2)
+ private String column3;
+
+ @ExcelProperty(value = "澶囨敞",index = 3)
+ private String column4;
+
+
+
}
--
Gitblit v1.9.1