From bc8cd378fd72f43e66120c540f57f630580aa093 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 11 九月 2025 10:57:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentLeanOut.java |  177 ++++++++++++++++++++++++++++------------------------------
 1 files changed, 86 insertions(+), 91 deletions(-)

diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentLeanOut.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentLeanOut.java
index 0ab7939..c4bdb77 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentLeanOut.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentLeanOut.java
@@ -16,157 +16,152 @@
 
 import java.io.Serializable;
 import java.util.Date;
-
 /**
  * @Description: 璁惧鍊熷嚭褰掕繕
  * @Author: jeecg-boot
- * @Date: 2025-05-13
+ * @Date:   2025-05-13
  * @Version: V1.0
  */
 @Data
 @TableName("eam_equipment_lean_out")
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value = "eam_equipment_lean_out瀵硅薄", description = "璁惧鍊熷嚭褰掕繕")
+@ApiModel(value="eam_equipment_lean_out瀵硅薄", description="璁惧鍊熷嚭褰掕繕")
 public class EamEquipmentLeanOut implements Serializable {
 
-    /**
-     * 涓婚敭
-     */
+    /**涓婚敭*/
     @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "涓婚敭")
     private String id;
-    /**
-     * 鍒涘缓浜�
-     */
+    /**鍒涘缓浜�*/
     @ApiModelProperty(value = "鍒涘缓浜�")
     private String createBy;
-    /**
-     * 鍒涘缓鏃堕棿
-     */
+    /**鍒涘缓鏃堕棿*/
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     private Date createTime;
-    /**
-     * 鏇存柊浜�
-     */
+    /**鏇存柊浜�*/
     @ApiModelProperty(value = "鏇存柊浜�")
     private String updateBy;
-    /**
-     * 鏇存柊鏃堕棿
-     */
+    /**鏇存柊鏃堕棿*/
     @ApiModelProperty(value = "鏇存柊鏃堕棿")
     private Date updateTime;
-    /**
-     * 鍒犻櫎鏍囪
-     */
+    /**鍒犻櫎鏍囪*/
     @ApiModelProperty(value = "鍒犻櫎鏍囪")
     private Integer delFlag;
-    /**
-     * 璁惧ID
-     */
+    /**璁惧ID*/
     @ApiModelProperty(value = "璁惧ID")
     private String equipmentId;
-    /**
-     * 鍗曟嵁鍙�
-     */
+    /**鍗曟嵁鍙�*/
     @Excel(name = "鍗曟嵁鍙�", width = 15)
     @ApiModelProperty(value = "鍗曟嵁鍙�")
     private String code;
-    /**
-     * 鍊熷叆閮ㄩ棬
-     */
+    /**鍊熷叆閮ㄩ棬*/
     @Excel(name = "鍊熷叆閮ㄩ棬", width = 15, dictTable = "mdc_production", dicText = "production_name", dicCode = "id")
     @ApiModelProperty(value = "鍊熷叆閮ㄩ棬")
     @Dict(dicCode = "mdc_production, production_name, id")
     private String leanDepartId;
-    /**
-     * 鍊熷叆璐ｄ换浜�
-     */
+    /**鍊熷叆璐ｄ换浜�*/
     @Excel(name = "鍊熷叆璐ｄ换浜�", width = 15)
     @ApiModelProperty(value = "鍊熷叆璐ｄ换浜�")
     @Dict(dicCode = "sys_user, realname, username")
     private String leanPerson;
-    /**
-     * 鍊熺敤鍘熷洜
-     */
+    /**鍊熺敤鍘熷洜*/
     @ApiModelProperty(value = "鍊熺敤鍘熷洜")
     private String leanReason;
-    /**
-     * 瀹℃壒绫诲瀷
-     */
-    @ApiModelProperty(value = "瀹℃壒绫诲瀷")
-    @Dict(dicCode = "approved_rejected")
-    private String approvalDealType;
-    /**
-     * 鍊熷嚭鐘舵��
-     */
+    /**鍊熷嚭鐘舵��*/
     @Excel(name = "鍊熷嚭鐘舵��", width = 15)
     @ApiModelProperty(value = "鍊熷嚭鐘舵��")
     @Dict(dicCode = "equipment_lean_out_status")
     private String leanStatus;
-    /**
-     * 鍊熷嚭寮�濮嬫椂闂�
-     */
+    /**鍊熷嚭寮�濮嬫椂闂�*/
     @ApiModelProperty(value = "鍊熷嚭鏃堕棿")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date leanStartTime;
-    /**
-     * 鍊熷嚭褰掕繕鏃堕棿
-     */
+    /**鍊熷嚭褰掕繕鏃堕棿*/
     @ApiModelProperty(value = "褰掕繕鏃堕棿")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date leanEndTime;
-    /**
-     * 瀹℃牳浜�
-     */
-    @Excel(name = "瀹℃牳浜�", width = 15)
-    @ApiModelProperty(value = "瀹℃牳浜�")
+    /**浣跨敤杞﹂棿瀹℃牳浜�*/
+    @Excel(name = "浣跨敤杞﹂棿瀹℃牳浜�", width = 15)
+    @ApiModelProperty(value = "浣跨敤杞﹂棿瀹℃牳浜�")
     @Dict(dicCode = "sys_user, realname, username")
-    private String approvalUser;
-    /**
-     * 瀹℃牳鎰忚
-     */
-    @Excel(name = "瀹℃牳鎰忚", width = 15)
-    @ApiModelProperty(value = "瀹℃牳鎰忚")
-    private String approvalComment;
-    /**
-     * 瀹℃牳鏃堕棿
-     */
-    @ApiModelProperty(value = "瀹℃牳鏃堕棿")
+    private String useApprovalUser;
+    /**浣跨敤杞﹂棿瀹℃壒绫诲瀷*/
+    @ApiModelProperty(value = "浣跨敤杞﹂棿瀹℃壒绫诲瀷")
+    @Dict(dicCode = "approved_rejected")
+    private String useApprovalDealType;
+    /**浣跨敤杞﹂棿瀹℃牳鎰忚*/
+    @Excel(name = "浣跨敤杞﹂棿瀹℃牳鎰忚", width = 15)
+    @ApiModelProperty(value = "浣跨敤杞﹂棿瀹℃牳鎰忚")
+    private String useApprovalComment;
+    /**浣跨敤杞﹂棿瀹℃牳鏃堕棿*/
+    @ApiModelProperty(value = "浣跨敤杞﹂棿瀹℃牳鏃堕棿")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date approvalTime;
-    /**
-     * 纭浜�
-     */
-    @Excel(name = "纭浜�", width = 15)
-    @ApiModelProperty(value = "纭浜�")
+    private Date useApprovalTime;
+
+    /**鍊熺敤杞﹂棿瀹℃牳浜�*/
+    @Excel(name = "鍊熺敤杞﹂棿瀹℃牳浜�", width = 15)
+    @ApiModelProperty(value = "鍊熺敤杞﹂棿瀹℃牳浜�")
     @Dict(dicCode = "sys_user, realname, username")
-    private String confirmUser;
-    /**
-     * 纭鎰忚
-     */
-    @Excel(name = "纭鎰忚", width = 15)
-    @ApiModelProperty(value = "纭鎰忚")
-    private String confirmComment;
-    /**
-     * 纭鏃堕棿
-     */
-    @ApiModelProperty(value = "纭鏃堕棿")
+    private String leanOutApprovalUser;
+    /**鍊熺敤杞﹂棿瀹℃壒绫诲瀷*/
+    @ApiModelProperty(value = "鍊熺敤杞﹂棿瀹℃壒绫诲瀷")
+    @Dict(dicCode = "approved_rejected")
+    private String leanOutApprovalDealType;
+    /**鍊熺敤杞﹂棿瀹℃牳鎰忚*/
+    @Excel(name = "鍊熺敤杞﹂棿瀹℃牳鎰忚", width = 15)
+    @ApiModelProperty(value = "浣跨敤杞﹂棿瀹℃牳鎰忚")
+    private String leanOutApprovalComment;
+    /**鍊熺敤杞﹂棿瀹℃牳鏃堕棿*/
+    @ApiModelProperty(value = "鍊熺敤杞﹂棿瀹℃牳鏃堕棿")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date confirmTime;
-    /**
-     * 澶囨敞
-     */
+    private Date leanOutApprovalTime;
+
+    /**浣跨敤杞﹂棿纭浜�*/
+    @Excel(name = "浣跨敤杞﹂棿纭浜�", width = 15)
+    @ApiModelProperty(value = "浣跨敤杞﹂棿纭浜�")
+    @Dict(dicCode = "sys_user, realname, username")
+    private String useConfirmUser;
+    /**浣跨敤杞﹂棿纭瀹℃壒绫诲瀷*/
+    @ApiModelProperty(value = "浣跨敤杞﹂棿纭瀹℃壒绫诲瀷")
+    @Dict(dicCode = "approved_rejected")
+    private String useConfirmDealType;
+    /**纭鎰忚*/
+    @Excel(name = "浣跨敤杞﹂棿纭鎰忚", width = 15)
+    @ApiModelProperty(value = "浣跨敤杞﹂棿纭鎰忚")
+    private String useConfirmComment;
+    /**浣跨敤杞﹂棿纭鏃堕棿*/
+    @ApiModelProperty(value = "浣跨敤杞﹂棿纭鏃堕棿")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date useConfirmTime;
+    /**鍊熺敤杞﹂棿纭浜�*/
+    @Excel(name = "鍊熺敤杞﹂棿纭浜�", width = 15)
+    @ApiModelProperty(value = "鍊熺敤杞﹂棿纭浜�")
+    @Dict(dicCode = "sys_user, realname, username")
+    private String leanOutConfirmUser;
+    /**鍊熺敤杞﹂棿纭瀹℃壒绫诲瀷*/
+    @ApiModelProperty(value = "鍊熺敤杞﹂棿纭瀹℃壒绫诲瀷")
+    @Dict(dicCode = "approved_rejected")
+    private String leanOutConfirmDealType;
+    /**鍊熺敤杞﹂棿纭鎰忚*/
+    @Excel(name = "鍊熺敤杞﹂棿纭鎰忚", width = 15)
+    @ApiModelProperty(value = "鍊熺敤杞﹂棿纭鎰忚")
+    private String leanOutConfirmComment;
+    /**鍊熺敤杞﹂棿纭鏃堕棿*/
+    @ApiModelProperty(value = "鍊熺敤杞﹂棿纭鏃堕棿")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date leanOutConfirmTime;
+    /**澶囨敞*/
     @Excel(name = "澶囨敞", width = 15)
     @ApiModelProperty(value = "澶囨敞")
     private String remark;
-    /**
-     * 澶囨敞
-     */
+    /**澶囨敞*/
     @Excel(name = "褰掕繕澶囨敞", width = 15)
     @ApiModelProperty(value = "褰掕繕澶囨敞")
     private String returnComment;

--
Gitblit v1.9.3