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/InspectionCycle.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/InspectionCycle.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/InspectionCycle.java
index 35803c0..7db1f5b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/InspectionCycle.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/InspectionCycle.java
@@ -54,6 +54,11 @@
@ApiModelProperty(value = "棣栨鐐规鏃堕棿")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
private Date firstInspectionTime;
+ /**涓婃鐐规鏃堕棿*/
+ @Excel(name = "涓婃鐐规鏃堕棿", width = 15)
+ @ApiModelProperty(value = "涓婃鐐规鏃堕棿")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date lastInspectionTime;
/**鎻愬墠鏃堕棿*/
@Excel(name = "鎻愬墠鏃堕棿", width = 15)
@ApiModelProperty(value = "鎻愬墠鏃堕棿")
@@ -152,4 +157,28 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private java.util.Date loseEfficacyTime;
+ @TableField(exist = false)
+ private String equipmentId;
+ @TableField(exist = false)
+ private String teamId;
+ @TableField(exist = false)
+ private String inspectionStandardId;
+ @TableField(exist = false)
+ private String inspectionStandardNum;
+ @TableField(exist = false)
+ private String inspectionProjectId;
+ @TableField(exist = false)
+ private String inspectionProjectName;
+ @TableField(exist = false)
+ private String detectionStandard;
+ @TableField(exist = false)
+ private String inspectionStandardDetailId;
+ @TableField(exist = false)
+ private String location;
+ @TableField(exist = false)
+ private String photo;
+ @TableField(exist = false)
+ private String inspectionMethod;
+
+
}
--
Gitblit v1.9.3