From 924f3df0232e8de51a745f8faa8b2029c09a52d5 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 08 七月 2025 17:27:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandard.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandard.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandard.java
index 01e1c6b..070541f 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandard.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandard.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;
@@ -8,6 +9,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import java.util.Date;
@@ -57,6 +59,7 @@
@ApiModelProperty(value = "璁惧ID")
private String equipmentId;
/**瑙勮寖鐘舵��;寰呮彁浜ゃ�佸惎鐢ㄣ�佷綔搴�*/
+ @Dict(dicCode = "technical_status_evaluation_standard_status")
@ApiModelProperty(value = "瑙勮寖鐘舵��;寰呮彁浜ゃ�佸惎鐢ㄣ�佷綔搴�")
private String standardStatus;
/**鏄惁鏈夊畨鍏ㄨ缃鏌�;鏄惁*/
@@ -75,4 +78,12 @@
@Excel(name = "澶囨敞", width = 15)
@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