From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceThreeAcceptance.java | 23 ++++++++++++++++++++++-
1 files changed, 22 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..cfbc3e5 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 = "淇濆吇閮ㄤ綅")
@@ -53,10 +53,16 @@
@Excel(name = "绗竴娆℃", width = 15)
@ApiModelProperty(value = "绗竴娆℃")
private java.lang.String firstInspect;
+ @Excel(name = "绗竴娆℃鏈�氳繃鍘熷洜", width = 15)
+ @ApiModelProperty(value = "绗竴娆℃鏈�氳繃鍘熷洜")
+ private java.lang.String firstNotPass;
/**绗簩娆℃*/
@Excel(name = "绗簩娆℃", width = 15)
@ApiModelProperty(value = "绗簩娆℃")
private java.lang.String secondInspect;
+ @Excel(name = "绗簩娆℃鏈�氳繃鍘熷洜", width = 15)
+ @ApiModelProperty(value = "绗簩娆℃鏈�氳繃鍘熷洜")
+ private java.lang.String secondNotPass;
/**delFlag*/
@Excel(name = "delFlag", width = 15)
@ApiModelProperty(value = "delFlag")
@@ -65,4 +71,19 @@
@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;
+
+ @TableField(exist = false)
+ private String receipts;
}
--
Gitblit v1.9.3