From e85c1425f6152ff82687cdccf04869e57536b5ce Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期五, 01 九月 2023 16:14:56 +0800
Subject: [PATCH] 加班管理导出接口

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java |   60 +++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java
index b7f506f..bf2d75d 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java
@@ -28,6 +28,37 @@
 
     private static final long serialVersionUID = -7163039765166584824L;
 
+    @TableField(exist = false)
+    @Excel(name = "璁惧缂栧彿", width = 20)
+    private String equipmentId;
+
+    @TableField(exist = false)
+    @Excel(name = "璁惧鍚嶇О", width = 20)
+    private String equipmentName;
+
+    /**
+     * 鐢熸晥鏃ユ湡
+     */
+    @Excel(name = "鐢熸晥鏃ユ湡", width = 15)
+    @TableField(exist = false)
+    private String effectiveDate;
+
+    /**
+     * 鐝寮�濮嬫椂闂�
+     */
+    @Excel(name = "鐝寮�濮嬫椂闂�", width = 20)
+    @ApiModelProperty("鐝寮�濮嬫椂闂�")
+    @TableField(exist = false)
+    private String startDate;
+
+    /**
+     * 鐝缁撴潫鏃堕棿
+     */
+    @Excel(name = "鐝缁撴潫鏃堕棿", width = 20)
+    @ApiModelProperty("鐝缁撴潫鏃堕棿")
+    @TableField(exist = false)
+    private String endDate;
+
     /**
      * 宸ヤ綔鏃ュ巻id
      */
@@ -53,35 +84,6 @@
     @Excel(name = "澶囨敞")
     @ApiModelProperty(value = "澶囨敞")
     private String remark;
-
-    @TableField(exist = false)
-    private String equipmentId;
-
-    @TableField(exist = false)
-    private String equipmentName;
-
-    /**
-     * 鐢熸晥鏃ユ湡
-     */
-    @Excel(name = "鐢熸晥鏃ユ湡", width = 15)
-    @TableField(exist = false)
-    private String effectiveDate;
-
-    /**
-     * 鐝寮�濮嬫椂闂�
-     */
-    @Excel(name = "鐝寮�濮嬫椂闂�", width = 20, format = "HH:mm:ss")
-    @ApiModelProperty("鐝寮�濮嬫椂闂�")
-    @TableField(exist = false)
-    private String startDate;
-
-    /**
-     * 鐝缁撴潫鏃堕棿
-     */
-    @Excel(name = "鐝缁撴潫鏃堕棿", width = 20, format = "HH:mm:ss")
-    @ApiModelProperty("鐝缁撴潫鏃堕棿")
-    @TableField(exist = false)
-    private String endDate;
 
     /**
      * 鍓嶅彴浼犲叆 鍒ゆ柇姣忎釜id

--
Gitblit v1.9.3