From b2a193c00bc97bf98d5db2d831b470af7e7449cf Mon Sep 17 00:00:00 2001
From: yangman <15045099937@qq.com>
Date: 星期三, 05 七月 2023 14:42:40 +0800
Subject: [PATCH] 修改扭矩配置管理mapper

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java |   40 ++++++++++++++++++++++++++++++----------
 1 files changed, 30 insertions(+), 10 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 4e1dcd0..3b0b8bb 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
@@ -1,6 +1,7 @@
 package org.jeecg.modules.mdc.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -14,6 +15,7 @@
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Description: 鎵煩閰嶇疆绠＄悊
@@ -38,43 +40,43 @@
     /**
      * 璁惧缂栧彿
      */
-    @Excel(name = "璁惧缂栧彿",width = 15)
+    @Excel(name = "璁惧缂栧彿", width = 15)
     @ApiModelProperty("璁惧缂栧彿")
     private String equipmentId;
 
     /**
      * 璁惧鍚嶇О
      */
-    @Excel(name = "璁惧鍚嶇О",width = 15)
+    @Excel(name = "璁惧鍚嶇О", width = 15)
     @ApiModelProperty("璁惧鍚嶇О")
     private String equipmentName;
 
     /**
      * 鏃ユ湡
      */
-    @JsonFormat(timezone = "GMT+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 date;
+    private Date torqueDate;
 
     /**
      * 鎵煩鍊�
      */
-    @Excel(name = "鎵煩鍊�",width = 15)
+    @Excel(name = "鎵煩鍊�", width = 15)
     @ApiModelProperty("鎵煩鍊�")
     private float torqueValue;
 
     /**
      * 澶囨敞
      */
-    @Excel(name = "澶囨敞",width = 15)
+    @Excel(name = "澶囨敞", width = 15)
     @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;
@@ -82,14 +84,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;
@@ -97,7 +99,25 @@
     /**
      * 鏇存柊浜�
      */
-    @Excel(name = "鏇存柊浜�",width = 15)
+    @Excel(name = "鏇存柊浜�", width = 15)
     @ApiModelProperty("鏇存柊浜�")
     private String updateBy;
+
+    /**
+     * 鍓嶅彴浼犲叆锛屽垽鏂瘡涓猧d
+     */
+    @TableField(exist = false)
+    private String parentId;
+
+    /**
+     * 鍓嶅彴浼犲叆 杞﹂棿灞傜骇锛�1锛岄儴闂ㄥ眰绾э細2
+     */
+    @TableField(exist = false)
+    private String typeTree;
+
+    /**
+     * 閮ㄩ棬parentId 鍏宠仈瀛愰泦id
+     */
+    @TableField(exist = false)
+    private List<String> mdcSectionIds;
 }

--
Gitblit v1.9.3