From 2be3886789a49856d5745f552051edd4ebfe1630 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 06 九月 2023 10:43:14 +0800
Subject: [PATCH] 导入字段校验调整

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java
index 882e779..f29d52d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java
@@ -63,22 +63,22 @@
     @Excel(name = "鍧愭爣鏁伴噺")
     private BigDecimal coordinateNum;
 
-    @Excel(name = "璁惧鐘舵��")
+    @Excel(name = "璁惧鐘舵��",dicCode = "equipment_status")
     private String equipmentStatus;
 
     @Excel(name = "閲嶉噺")
     private String equipmentUda3;
 
-    @Excel(name = "閲嶉噺璁¢噺鍗曚綅",dicCode = "id",dicText = "name",dictTable = "mom_base_unit")
+    @Excel(name = "閲嶉噺璁¢噺鍗曚綅")
     private String equipmentUda4;
 
     @Excel(name = "鍔熻兘浣嶇疆")
     private String equipmentUda5;
 
     @Excel(name = "瀹夎浣嶇疆")
-    private String equipmentUda2;
+    private String location;
 
-    @Excel(name = "鍑哄巶鏃ユ湡",importFormat = "yyyyMMdd")
+    @Excel(name = "鍑哄巶鏃ユ湡")
     private String leaveFactoryDate;
 
     @Excel(name = "绔嬮」鍗″彿")
@@ -87,11 +87,11 @@
     @Excel(name = "璧勯噾鏉ユ簮")
     private String fundSource;
 
-    @Excel(name = "楠屾敹鏃ユ湡",importFormat = "yyyyMMdd")
+    @Excel(name = "楠屾敹鏃ユ湡")
     private String acceptanceCheckDate;
 
     @Excel(name = "鍑哄巶缂栧彿")
-    private String factoryNo;
+    private String factoryNumber;
 
     @Excel(name = "璧勪骇鍒堕�犲晢",dicCode = "id",dictTable="mom_base_constructor",dicText="name")
     private String constructorId;
@@ -108,6 +108,11 @@
     @Excel(name = "鎬诲姛鐜�")
     private String gpo;
 
+    @Excel(name = "鎶�鏈姸鎬�",dicCode = "technology_status")
+    private String technologyStatus;
+
+
+
 
 
 

--
Gitblit v1.9.3