From d76b518341ec0644c3500555d5c4121bc30d581e Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 31 七月 2025 09:24:09 +0800
Subject: [PATCH] 台账导入导出字段修改

---
 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
index 7462ff2..e35853c 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipment.java
@@ -257,7 +257,15 @@
     /**
      * 鍑哄巶鏃ユ湡
      */
-    @Excel(name = "鍑哄巶鏃ユ湡", width = 25, format = "yyyy/MM/dd", orderNum = "26")
+    @Excel(name = "鍑哄巶鏃ユ湡", width = 25,  orderNum = "26")
+    @ApiModelProperty(value = "鍑哄巶鏃ユ湡")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private transient String leaveFactory;
+
+    /**
+     * 鍑哄巶鏃ユ湡
+     */
     @ApiModelProperty(value = "鍑哄巶鏃ユ湡")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -389,7 +397,7 @@
 
     /**涓嬫涓変繚鏃ユ湡*/
     @TableField(exist = false)
-    @Excel(name = "涓嬫涓変繚鏃ユ湡", width = 15, format = "yyyy/MM/dd", orderNum = "43")
+    @Excel(name = "涓変繚鏃ユ湡", width = 15, format = "yyyy/MM/dd", orderNum = "43")
     @ApiModelProperty(value = "涓嬫涓変繚鏃ユ湡")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -410,7 +418,7 @@
     private java.util.Date latestTechnologyCheck;
     /**鎶�鏈姸鎬佷笅娆¢壌瀹氭棩鏈�*/
     @TableField(exist = false)
-    @Excel(name = "鎶�鏈姸鎬佷笅娆¢壌瀹氭棩鏈�", width = 15, format = "yyyy/MM/dd", orderNum = "46")
+    @Excel(name = "鎶�鏈姸鎬侀壌瀹氭棩鏈�", width = 15, format = "yyyy/MM/dd", orderNum = "46")
     @ApiModelProperty(value = "鎶�鏈姸鎬佷笅娆¢壌瀹氭棩鏈�")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")

--
Gitblit v1.9.3