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/EamEquipmentTransfer.java | 127 +++++++++++++++++++++++++++--------------
1 files changed, 83 insertions(+), 44 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentTransfer.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentTransfer.java
index 8fc1465..e41b24c 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentTransfer.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamEquipmentTransfer.java
@@ -1,8 +1,6 @@
package org.jeecg.modules.eam.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -10,6 +8,7 @@
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;
import java.io.Serializable;
@@ -26,36 +25,10 @@
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "eam_equipment_transfer瀵硅薄", description = "璁惧褰掑睘鍙樺姩")
-public class EamEquipmentTransfer implements Serializable {
+public class EamEquipmentTransfer extends JeecgEntity implements Serializable {
- /**
- * 涓婚敭
- */
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "涓婚敭")
- private String id;
- /**
- * 鍒涘缓浜�
- */
- @Excel(name = "鍒涘缓浜�", width = 15)
- @ApiModelProperty(value = "鍒涘缓浜�")
- private String createBy;
- /**
- * 鍒涘缓鏃堕棿
- */
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private Date createTime;
- /**
- * 鏇存柊浜�
- */
- @Excel(name = "鏇存柊浜�", width = 15)
- @ApiModelProperty(value = "鏇存柊浜�")
- private String updateBy;
- /**
- * 鏇存柊鏃堕棿
- */
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
- private Date updateTime;
+ private static final long serialVersionUID = -1869845900682810093L;
+
/**
* 鍒犻櫎鏍囪
*/
@@ -114,28 +87,94 @@
@ApiModelProperty(value = "鍙樺姩鏃ユ湡")
private Date transferTime;
/**
- * 瀹℃牳浜�
+ * 浣跨敤鍗曚綅棰嗗
*/
- @Excel(name = "瀹℃牳浜�", width = 15)
- @ApiModelProperty(value = "瀹℃牳浜�")
+ @Excel(name = "浣跨敤鍗曚綅棰嗗", width = 15)
+ @ApiModelProperty(value = "浣跨敤鍗曚綅棰嗗")
@Dict(dicCode = "sys_user, realname, username")
- private String approvalUser;
+ private String useLeader;
/**
- * 瀹℃牳绫诲瀷
+ * 浣跨敤鍗曚綅棰嗗瀹℃牳绫诲瀷
*/
- @ApiModelProperty(value = "瀹℃牳绫诲瀷")
+ @ApiModelProperty(value = "浣跨敤鍗曚綅棰嗗瀹℃牳绫诲瀷")
@Dict(dicCode = "approved_rejected")
- private String approvalDealType;
+ private String useLeaderApprovalDealType;
/**
- * 瀹℃牳鎰忚
+ * 浣跨敤鍗曚綅棰嗗瀹℃牳鎰忚
*/
- @ApiModelProperty(value = "瀹℃牳鎰忚")
- private String approvalComment;
+ @ApiModelProperty(value = "浣跨敤鍗曚綅棰嗗瀹℃牳鎰忚")
+ private String useLeaderApprovalComment;
/**
- * 瀹℃牳鏃堕棿
+ * 浣跨敤鍗曚綅棰嗗瀹℃牳鏃堕棿
*/
- @ApiModelProperty(value = "瀹℃牳鏃堕棿")
- private Date approvalTime;
+ @ApiModelProperty(value = "浣跨敤鍗曚綅棰嗗瀹℃牳鏃堕棿")
+ private Date useLeaderApprovalTime;
+ /**
+ * 璋冨叆鍗曚綅棰嗗
+ */
+ @Excel(name = "璋冨叆鍗曚綅棰嗗", width = 15)
+ @ApiModelProperty(value = "璋冨叆鍗曚綅棰嗗")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String transferLeader;
+ /**
+ * 璋冨叆鍗曚綅棰嗗瀹℃牳绫诲瀷
+ */
+ @ApiModelProperty(value = "璋冨叆鍗曚綅棰嗗瀹℃牳绫诲瀷")
+ @Dict(dicCode = "approved_rejected")
+ private String transferLeaderApprovalDealType;
+ /**
+ * 璋冨叆鍗曚綅棰嗗瀹℃牳鎰忚
+ */
+ @ApiModelProperty(value = "璋冨叆鍗曚綅棰嗗瀹℃牳鎰忚")
+ private String transferLeaderApprovalComment;
+ /**
+ * 璋冨叆鍗曚綅棰嗗瀹℃牳鏃堕棿
+ */
+ @ApiModelProperty(value = "璋冨叆鍗曚綅棰嗗瀹℃牳鏃堕棿")
+ private Date transferLeaderApprovalTime;
+ /**
+ * 鏈哄姩鍔炵‘璁や汉
+ */
+ @Excel(name = "鏈哄姩鍔炵‘璁や汉", width = 15)
+ @ApiModelProperty(value = "鏈哄姩鍔炵‘璁や汉")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String externalConfirm;
+ /**
+ * 鏈哄姩鍔炵‘璁ゆ椂闂�
+ */
+ @ApiModelProperty(value = "鏈哄姩鍔炵‘璁ゆ椂闂�")
+ private Date externalConfirmTime;
+ /**
+ * 鏄惁闇�瑕佸叕鍙搁瀵煎鎵�
+ */
+ @Excel(name = "鏄惁闇�瑕佸叕鍙搁瀵煎鎵�", width = 15)
+ @ApiModelProperty(value = "鏄惁闇�瑕佸叕鍙搁瀵煎鎵�")
+ @Dict(dicCode = "yn")
+ private String companyLeaderCheck;
+
+ /**
+ * 鍏徃棰嗗
+ */
+ @Excel(name = "鍏徃棰嗗", width = 15)
+ @ApiModelProperty(value = "鍏徃棰嗗")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String companyLeader;
+ /**
+ * 鍏徃棰嗗瀹℃牳绫诲瀷
+ */
+ @ApiModelProperty(value = "鍏徃棰嗗瀹℃牳绫诲瀷")
+ @Dict(dicCode = "approved_rejected")
+ private String companyLeaderApprovalDealType;
+ /**
+ * 鍏徃棰嗗瀹℃牳鎰忚
+ */
+ @ApiModelProperty(value = "鍏徃棰嗗瀹℃牳鎰忚")
+ private String companyLeaderApprovalComment;
+ /**
+ * 鍏徃棰嗗瀹℃牳鏃堕棿
+ */
+ @ApiModelProperty(value = "鍏徃棰嗗瀹℃牳鏃堕棿")
+ private Date companyLeaderApprovalTime;
/**
* 澶囨敞
*/
--
Gitblit v1.9.3