From 685bc509fbd7bec9623429af0b5e548f550f27d7 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 11 七月 2025 20:16:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrder.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 9243597..922c144 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
@@ -113,10 +113,10 @@
/**瀹夊叏瑁呯疆妫�鏌ョ‘璁ょ粨鏋�*/
@ApiModelProperty(value = "瀹夊叏瑁呯疆妫�鏌ョ‘璁ょ粨鏋�")
@Dict(dicCode = "approved_rejected")
- private String safetyCheckResult;
+ private String safetyCheckConfirmResult;
/**瀹夊叏瑁呯疆妫�鏌ョ‘璁ゆ剰瑙�*/
@ApiModelProperty(value = "瀹夊叏瑁呯疆妫�鏌ョ‘璁ゆ剰瑙�")
- private String safetyCheckComment;
+ private String safetyCheckConfirmComment;
/**璁惧绮惧害妫�鏌ョ‘璁や汉*/
@ApiModelProperty(value = "璁惧绮惧害妫�鏌ョ‘璁や汉")
@Dict(dicCode = "sys_user, realname, username")
--
Gitblit v1.9.3