From 7c77e020b81e42fb65aa966742ff7c93e73668e1 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期一, 26 五月 2025 17:57:55 +0800
Subject: [PATCH] 设备调拨功能增加
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java
index 81095c5..635a7d9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamSecondMaintenanceOrder.java
@@ -134,6 +134,11 @@
*/
@ApiModelProperty(value = "纭鎰忚")
private String confirmComment;
+
+ /** 纭绫诲瀷 1 閫氳繃 2 椹冲洖 */
+ @ApiModelProperty(value = "纭绫诲瀷")
+ @Dict(dicCode = "approved_rejected")
+ private String confirmDealType;
/**
* 纭鏃堕棿
*/
@@ -142,6 +147,26 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date confirmTime;
/**
+ * 鍗曚綅棰嗗纭
+ */
+ @Excel(name = "鍗曚綅棰嗗纭", width = 15)
+ @ApiModelProperty(value = "鍗曚綅棰嗗纭")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String confirmLeader;
+ /**
+ * 棰嗗鎰忚
+ */
+ @ApiModelProperty(value = "棰嗗鎰忚")
+ private String leaderConfirmComment;
+ /**
+ * 棰嗗纭鏃堕棿
+ */
+ @ApiModelProperty(value = "棰嗗纭鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date leaderConfirmTime;
+
+ /**
* 淇濆吇涓婁紶鍥剧墖
*/
@Excel(name = "淇濆吇涓婁紶鍥剧墖", width = 15)
--
Gitblit v1.9.3