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 | 8 ++++++++
1 files changed, 8 insertions(+), 0 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 e99c3ba..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
@@ -126,6 +126,10 @@
@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 = "浣跨敤杞﹂棿纭鎰忚")
@@ -140,6 +144,10 @@
@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 = "鍊熺敤杞﹂棿纭鎰忚")
--
Gitblit v1.9.3