From deec8d86a5eee2fc9ec18f6749076ea20b9edc66 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 17 十月 2023 17:42:29 +0800
Subject: [PATCH] 保养问题修改

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java |   38 +++++++++++++++++++++++++-------------
 1 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java
index 8615f0b..bdea1c6 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java
@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -28,7 +29,8 @@
 @TableName("mdc_torque_config")
 @ApiModel(value = "mdc_torque_config瀵硅薄", description = "鎵煩閰嶇疆绠＄悊")
 public class MdcTorqueConfig implements Serializable {
-    private static final long serialVersionUID = 1L;
+
+    private static final long serialVersionUID = -8646261637017242975L;
 
     /**
      * 涓婚敭
@@ -40,43 +42,44 @@
     /**
      * 璁惧缂栧彿
      */
-    @Excel(name = "璁惧缂栧彿",width = 15)
+    @Excel(name = "璁惧缂栧彿", width = 15)
     @ApiModelProperty("璁惧缂栧彿")
     private String equipmentId;
 
     /**
      * 璁惧鍚嶇О
      */
-    @Excel(name = "璁惧鍚嶇О",width = 15)
+    @Excel(name = "璁惧鍚嶇О", width = 25)
     @ApiModelProperty("璁惧鍚嶇О")
     private String equipmentName;
 
     /**
-     * 鏃ユ湡
+     * 鏃堕棿
      */
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "鏃堕棿", width = 30, 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")
-    @ApiModelProperty(value = "鏃ユ湡")
-    private Date date;
+    @ApiModelProperty(value = "鏃堕棿")
+    private Date torqueDate;
 
     /**
      * 鎵煩鍊�
      */
-    @Excel(name = "鎵煩鍊�",width = 15)
+    @Excel(name = "鎵煩鍊�", width = 15)
     @ApiModelProperty("鎵煩鍊�")
     private float torqueValue;
 
     /**
      * 澶囨敞
      */
-    @Excel(name = "澶囨敞",width = 15)
+    @Excel(name = "澶囨敞", width = 30)
     @ApiModelProperty("澶囨敞")
     private String notes;
 
     /**
      * 鍒涘缓鏃堕棿
      */
-    @JsonFormat(timezone = "GMY+8",pattern = "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")
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     private Date createTime;
@@ -84,14 +87,14 @@
     /**
      * 鍒涘缓浜�
      */
-    @Excel(name = "鍒涘缓浜�",width = 15)
+    @Excel(name = "鍒涘缓浜�", width = 15)
     @ApiModelProperty("鍒涘缓浜�")
     private String createBy;
 
     /**
      * 鏇存柊鏃堕棿
      */
-    @JsonFormat(timezone = "GMY+8",pattern = "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")
     @ApiModelProperty("鏇存柊鏃堕棿")
     private Date updateTime;
@@ -99,10 +102,19 @@
     /**
      * 鏇存柊浜�
      */
-    @Excel(name = "鏇存柊浜�",width = 15)
+    @Excel(name = "鏇存柊浜�", width = 15)
     @ApiModelProperty("鏇存柊浜�")
     private String updateBy;
 
+    @TableField(exist = false)
+    private String equipmentIds;
+
+    @TableField(exist = false)
+    private String startTime;
+
+    @TableField(exist = false)
+    private String endTime;
+
     /**
      * 鍓嶅彴浼犲叆锛屽垽鏂瘡涓猧d
      */

--
Gitblit v1.9.3