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/src/main/java/org/jeecg/modules/eam/request/EamEquipmentTransferRequest.java | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentTransferRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentTransferRequest.java
index 612227e..3a492b5 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentTransferRequest.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamEquipmentTransferRequest.java
@@ -6,7 +6,6 @@
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
-import org.jeecgframework.poi.excel.annotation.Excel;
import java.io.Serializable;
import java.util.Date;
@@ -91,27 +90,40 @@
@ApiModelProperty(value = "鍙樺姩鏃ユ湡")
private Date transferTime;
/**
- * 瀹℃牳浜�
+ * 浣跨敤鍗曚綅棰嗗瀹℃牳绫诲瀷
*/
- @Excel(name = "瀹℃牳浜�", width = 15)
- @ApiModelProperty(value = "瀹℃牳浜�")
- private String approvalUser;
+ @ApiModelProperty(value = "浣跨敤鍗曚綅棰嗗瀹℃牳绫诲瀷")
+ private String useLeaderApprovalDealType;
/**
- * 瀹℃牳鏃堕棿
+ * 浣跨敤鍗曚綅棰嗗瀹℃牳鎰忚
*/
- @ApiModelProperty(value = "瀹℃牳鏃堕棿")
- private Date approvalTime;
+ @ApiModelProperty(value = "浣跨敤鍗曚綅棰嗗瀹℃牳鎰忚")
+ private String useLeaderApprovalComment;
/**
- * 瀹℃牳绫诲瀷
+ * 璋冨叆鍗曚綅棰嗗瀹℃牳绫诲瀷
*/
- @Excel(name = "瀹℃牳绫诲瀷", width = 15)
- @ApiModelProperty(value = "瀹℃牳绫诲瀷")
- private String approvalDealType;
+ @ApiModelProperty(value = "璋冨叆鍗曚綅棰嗗瀹℃牳绫诲瀷")
+ private String transferLeaderApprovalDealType;
/**
- * 瀹℃牳鎰忚
+ * 璋冨叆鍗曚綅棰嗗瀹℃牳鎰忚
*/
- @ApiModelProperty(value = "瀹℃牳鎰忚")
- private String approvalComment;
+ @ApiModelProperty(value = "璋冨叆鍗曚綅棰嗗瀹℃牳鎰忚")
+ private String transferLeaderApprovalComment;
+ /**
+ * 鏄惁闇�瑕佸叕鍙搁瀵煎鎵�
+ */
+ @ApiModelProperty(value = "鏄惁闇�瑕佸叕鍙搁瀵煎鎵�")
+ private String companyLeaderCheck;
+ /**
+ * 鍏徃棰嗗瀹℃牳绫诲瀷
+ */
+ @ApiModelProperty(value = "鍏徃棰嗗瀹℃牳绫诲瀷")
+ private String companyLeaderApprovalDealType;
+ /**
+ * 鍏徃棰嗗瀹℃牳鎰忚
+ */
+ @ApiModelProperty(value = "鍏徃棰嗗瀹℃牳鎰忚")
+ private String companyLeaderApprovalComment;
/**
* 澶囨敞
*/
--
Gitblit v1.9.3