From b2772fdcf0c26fac4fc8d1852fd24cf0f5af0f6d Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期二, 24 十月 2023 19:11:26 +0800
Subject: [PATCH] 故障报修

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
index 1bd959f..60b836c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java
@@ -246,6 +246,7 @@
     private String  securityConfiguration;
     @ApiModelProperty(value = "鍐峰嵈绯荤粺")
     @Excel(name = "鍐峰嵈绯荤粺", width = 15,orderNum = "10")
+    @Dict(dicCode = "cooling_system")
     private String  coolingSystem;
     @Excel(name = "鐏伀鍣�", width = 15,orderNum = "11")
     @ApiModelProperty(value = "鐏伀鍣�")
@@ -321,14 +322,14 @@
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private java.util.Date 	technologyStatusExpirationTime;
 
-    @Excel(name = "鏈鎶�鏈姸鎬侀壌瀹氭椂闂�", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "鏈鎶�鏈姸鎬侀壌瀹氭椂闂�", width = 20, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private java.util.Date 	technologyStatusQualificationTime;
 
-    @Excel(name = "涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�", width = 20, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private java.util.Date 	nextTechnologyStatusQualificationTime;
 
     @Excel(name = "鏈浜屼繚鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@@ -367,4 +368,5 @@
     private String equipmentCategoryUda1;
     @TableField(exist = false)
     private String maintenanceOrderId;
+    private String checkPeriod;
 }

--
Gitblit v1.9.3