From 659c74e7aaf751cc10ac47b7e0939f235a17d873 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 06 九月 2025 10:12:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/jeecg/modules/eam/dto/MaintenanceStandardImport.java |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/jeecg/modules/eam/dto/MaintenanceStandardImport.java b/src/main/java/org/jeecg/modules/eam/dto/MaintenanceStandardImport.java
index 451d990..7b3bcf8 100644
--- a/src/main/java/org/jeecg/modules/eam/dto/MaintenanceStandardImport.java
+++ b/src/main/java/org/jeecg/modules/eam/dto/MaintenanceStandardImport.java
@@ -8,12 +8,18 @@
 @Data
 public class MaintenanceStandardImport implements Serializable {
 
-    @Excel(name = "鍥惧彿", width = 15)
-    private Integer itemCode;
-    @Excel(name = "鐐规椤圭洰", width = 15)
+    @Excel(name = "NO", width = 15)
+    private String itemCode;
+
+    @Excel(name = "鐐规鍐呭", width = 15)
     private String itemName;
-    @Excel(name = "鐐规閮ㄤ綅", width = 15)
+
+    @Excel(name = "鐐规鏂规硶", width = 15)
+    private String subItemName;
+
+    @Excel(name = "閮ㄤ綅鍚嶇О", width = 15)
     private String itemPart;
-    @Excel(name = "鐐规瑕佹眰", width = 15)
+
+    @Excel(name = "鍩哄噯", width = 15)
     private String itemDemand;
 }

--
Gitblit v1.9.3