From 76c5ad320495758d4e76d852d96914f1b405ece7 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期一, 15 九月 2025 11:52:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/eam/dto/MaintenanceStandardImport.java | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 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..b930278 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,46 @@
@Data
public class MaintenanceStandardImport implements Serializable {
- @Excel(name = "鍥惧彿", width = 15)
- private Integer itemCode;
- @Excel(name = "鐐规椤圭洰", width = 15)
- private String itemName;
- @Excel(name = "鐐规閮ㄤ綅", width = 15)
+// @Excel(name = "NO", width = 15)
+// private String itemCode;
+//
+// @Excel(name = "鐐规鍐呭", width = 15)
+// private String itemName;
+//
+// @Excel(name = "鐐规鏂规硶", width = 15)
+// private String subItemName;
+//
+// @Excel(name = "閮ㄤ綅鍚嶇О", width = 15)
+// private String itemPart;
+//
+// @Excel(name = "鍩哄噯", width = 15)
+// private String itemDemand;
+
+
+
+
+ @Excel(name = "NO")
+ private String itemCode;
+
+ @Excel(name = "鐐规鏉′欢")
+ private String condition;
+
+ @Excel(name = "閮ㄤ綅鍚嶇О")
private String itemPart;
- @Excel(name = "鐐规瑕佹眰", width = 15)
+
+ @Excel(name = "鐐规鍐呭")
+ private String itemName;
+
+ @Excel(name = "鐐规鏂规硶")
+ private String subItemName;
+
+ @Excel(name = "鍩哄噯")
private String itemDemand;
+
+ @Excel(name = "寮傚父澶勭悊鍩哄噯")
+ private String abnormal;
+
+ @Excel(name = "鍛ㄦ湡")
+ private String period;
+
}
--
Gitblit v1.9.3