From b7eab0dfd01f691efa10980aebc872fa872cb8ea Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期三, 30 七月 2025 14:50:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java
index 9d50b04..251c955 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java
@@ -51,7 +51,7 @@
*/
@Excel(name = "璁惧ID", width = 15)
@ApiModelProperty(value = "璁惧ID")
- @Dict(dictTable = "eam_equipment", dicCode = "id", dicText = "equipment_code")
+// @Dict(dictTable = "eam_equipment", dicCode = "id", dicText = "equipment_code")
private String equipmentId;
/**
* 缁翠慨鐘舵��
@@ -71,6 +71,16 @@
@ApiModelProperty(value = "缁翠慨缁撴潫鏃堕棿")
private Date actualEndTime;
/**
+ * 鏄惁棰嗙敤澶囦欢 1锛氭槸 0锛氬惁
+ */
+ @ApiModelProperty(value = "鏄惁棰嗙敤澶囦欢")
+ private Integer isUseSpare;
+ /**
+ * 澶囦欢鎻忚堪
+ */
+ @ApiModelProperty(value = "澶囦欢鎻忚堪")
+ private String sparePartDescription;
+ /**
* 鏁呴殰鍘熷洜
*/
@Excel(name = "鏁呴殰鍘熷洜", width = 15)
@@ -87,6 +97,7 @@
*/
@Excel(name = "缁翠慨璐熻矗浜�", width = 15)
@ApiModelProperty(value = "缁翠慨璐熻矗浜�")
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String repairer;
/**
* 鏄惁濮斿
@@ -126,4 +137,9 @@
@TableField(exist = false)
@ApiModelProperty(value = "璁惧鍚嶇О")
private String equipmentName;
+ //鍒楄〃灞曠ず
+ @TableField(exist = false)
+ private String equipmentCode;
+ @TableField(exist = false)
+ private String installationPosition;
}
--
Gitblit v1.9.3