From 584dbcd691e66b6deb4d4821ab6eea10bf8c35dd Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 18 七月 2025 11:31:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusChangeDetail.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusChangeDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusChangeDetail.java
index 567a90e..6654758 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusChangeDetail.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusChangeDetail.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;
@@ -40,6 +41,9 @@
/**鏇存柊鏃堕棿*/
@ApiModelProperty(value = "鏇存柊鏃堕棿")
private Date updateTime;
+ /**鍙樻洿鍗旾D*/
+ @ApiModelProperty(value = "鍙樻洿鍗旾D")
+ private String changeOrderId;
/**璁惧ID*/
@ApiModelProperty(value = "璁惧ID")
private String equipmentId;
@@ -61,7 +65,14 @@
/**楠屾敹妫�鏌ョ粨鏋�;澶т慨銆佹敼閫� 闇�瑕佸～鍐欓獙鏀剁粨鏋滐紝鎼縼鎸夌収鎶�鏈姸鎬侀壌瀹氬伐鍗曠淮鎶わ紝鍏朵粬鏆傛湭浣跨敤鍒帮紝鍙鐣欐绫诲瀷*/
@ApiModelProperty(value = "楠屾敹妫�鏌ョ粨鏋�;澶т慨銆佹敼閫� 闇�瑕佸～鍐欓獙鏀剁粨鏋滐紝鎼縼鎸夌収鎶�鏈姸鎬侀壌瀹氬伐鍗曠淮鎶わ紝鍏朵粬鏆傛湭浣跨敤鍒帮紝鍙鐣欐绫诲瀷")
private String acceptanceCheckResult;
- /**鎶�鏈姸鎬侀壌瀹氬伐鍗旾D;鎼縼浣跨敤*/
- @ApiModelProperty(value = "鎶�鏈姸鎬侀壌瀹氬伐鍗旾D;鎼縼浣跨敤")
- private String orderId;
+
+ //鍒楄〃灞曠ず
+ @TableField(exist = false)
+ private String equipmentCode;
+ @TableField(exist = false)
+ private String equipmentName;
+ @TableField(exist = false)
+ private String equipmentModel;
+ @TableField(exist = false)
+ private String factoryName;
}
--
Gitblit v1.9.3