From 82cae82571a0c6c57ee5dc357efaf0e238c20ac9 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 10 七月 2025 14:54:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrder.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrder.java
index 93424a1..58973d0 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrder.java
@@ -1,6 +1,7 @@
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;
@@ -93,7 +94,10 @@
private String repairManagerSignature;
/**缁翠慨瀹や富浠荤瀛楁椂闂�*/
@ApiModelProperty(value = "缁翠慨瀹や富浠荤瀛楁椂闂�")
- private Date repairManagerSignatureTime1;
+ private Date repairManagerSignatureTime;
+ /**缁翠慨瀹や富浠绘剰瑙�*/
+ @ApiModelProperty(value = "缁翠慨瀹や富浠绘剰瑙�")
+ private String repairManagerComment;
/**璇曚欢妫�鏌ョ粨鏋�;鍚堟牸銆佷笉鍚堟牸*/
@ApiModelProperty(value = "璇曚欢妫�鏌ョ粨鏋�;鍚堟牸銆佷笉鍚堟牸")
private String sampleCheckResult;
@@ -103,6 +107,18 @@
/**宸ヨ壓鍛樼瀛楁椂闂�*/
@ApiModelProperty(value = "宸ヨ壓鍛樼瀛楁椂闂�")
private Date processTechnicianSignatureTime;
+ /**宸ヨ壓鍛樻剰瑙�*/
+ @ApiModelProperty(value = "宸ヨ壓鍛樻剰瑙�")
+ private String processTechnicianComment;
+ /**浣跨敤鍗曚綅鎶�鏈富绠＄瀛�*/
+ @ApiModelProperty(value = "浣跨敤鍗曚綅鎶�鏈富绠＄瀛�")
+ private String departTechnicalLeaderSignature;
+ /**浣跨敤鍗曚綅鎶�鏈富绠＄瀛楁椂闂�*/
+ @ApiModelProperty(value = "浣跨敤鍗曚綅鎶�鏈富绠＄瀛楁椂闂�")
+ private Date departTechnicalLeaderSignatureTime;
+ /**浣跨敤鍗曚綅鎶�鏈富绠℃剰瑙�*/
+ @ApiModelProperty(value = "浣跨敤鍗曚綅鎶�鏈富绠℃剰瑙�")
+ private String departTechnicalLeaderComment;
/**閴村畾缁撴灉;鍚堟牸銆侀檺鐢ㄣ�佺鐢�*/
@ApiModelProperty(value = "閴村畾缁撴灉;鍚堟牸銆侀檺鐢ㄣ�佺鐢�")
private String evaluationResult;
@@ -115,6 +131,9 @@
/**璁惧妫�鏌ヤ汉绛惧瓧鏃堕棿*/
@ApiModelProperty(value = "璁惧妫�鏌ヤ汉绛惧瓧鏃堕棿")
private Date inspectorSignatureTime;
+ /**璁惧妫�鏌ヤ汉鎰忚*/
+ @ApiModelProperty(value = "璁惧妫�鏌ヤ汉鎰忚")
+ private String inspectorComment;
/**闄勫綍A HF缂栫爜*/
@ApiModelProperty(value = "闄勫綍A HF缂栫爜")
private String hfCodeA;
@@ -130,4 +149,12 @@
/**澶囨敞*/
@ApiModelProperty(value = "澶囨敞")
private String remark;
+
+ //鍒楄〃灞曠ず
+ @TableField(exist = false)
+ private String equipmentCode;
+ @TableField(exist = false)
+ private String equipmentName;
+ @TableField(exist = false)
+ private String equipmentModel;
}
--
Gitblit v1.9.3