From ff9dc3f8220dfeb9acddd2f86c28718001e70314 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 30 十月 2023 09:44:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceThreeAcceptance.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceThreeAcceptance.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceThreeAcceptance.java
index 7a85557..591b44a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceThreeAcceptance.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceThreeAcceptance.java
@@ -36,7 +36,7 @@
/**3淇濆伐鍗昳d*/
@Excel(name = "3淇濆伐鍗昳d", width = 15)
@ApiModelProperty(value = "3淇濆伐鍗昳d")
- private java.lang.String maintenanceOrderId;
+ private java.lang.String maintenanceOrderDetailId;
/**淇濆吇閮ㄤ綅*/
@Excel(name = "淇濆吇閮ㄤ綅", width = 15)
@ApiModelProperty(value = "淇濆吇閮ㄤ綅")
@@ -65,4 +65,16 @@
@TableField(exist = false)
private List<MaintenanceThreeAcceptance> maintenanceThreeAcceptances;
+
+ @TableField(exist = false)
+ private String maintenanceOrderId;
+
+ @TableField(exist = false)
+ private String notPassReason;
+
+ @TableField(exist = false)
+ private String maintenanceCycle;
+
+ @TableField(exist = false)
+ private String equipmentId;
}
--
Gitblit v1.9.3