From d015cc0b48ca51a2b93b6c60c91dc352a104b1e7 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 23 九月 2024 10:41:50 +0800
Subject: [PATCH] 删除密码加密

---
 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTakecareDetail.java |   32 ++++++++++++++++++++++----------
 1 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTakecareDetail.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTakecareDetail.java
index aa20823..4588281 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTakecareDetail.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTakecareDetail.java
@@ -5,12 +5,13 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
  * 设备保养明细(EquipmentTakecareDetail)表实体类
  *
  * @author xurui
- * @since 2022-08-03 11:14:57
+ * @since 2022-08-29 08:37:54
  */
 @SuppressWarnings("serial")
 @TableName("equipment_takecare_detail")
@@ -28,7 +29,7 @@
     }
 
                 //具体类型(页面左侧的导航栏使用) 0:仪器仪表信息 1:生产设备设施 2:安全设备设施  3:重点监管装置/设备
-    private Integer infoTpe;
+            private Integer infoTpe;
         
     public Integer getInfoTpe() {
         return infoTpe;
@@ -38,7 +39,7 @@
         this.infoTpe = infoTpe;
     }
                 //设备ID/外键
-    private Long equipmentId;
+            private Long equipmentId;
         
     public Long getEquipmentId() {
         return equipmentId;
@@ -48,7 +49,7 @@
         this.equipmentId = equipmentId;
     }
                 //保养内容
-    private String takecareMemo;
+            private String takecareMemo;
         
     public String getTakecareMemo() {
         return takecareMemo;
@@ -58,7 +59,7 @@
         this.takecareMemo = takecareMemo;
     }
                 //保养负责人/外键
-    private Long leadingPersonId;
+            private Long leadingPersonId;
         
     public Long getLeadingPersonId() {
         return leadingPersonId;
@@ -68,7 +69,7 @@
         this.leadingPersonId = leadingPersonId;
     }
                 //保养负责人名称
-    private String leadingPersonName;
+            private String leadingPersonName;
         
     public String getLeadingPersonName() {
         return leadingPersonName;
@@ -78,7 +79,8 @@
         this.leadingPersonName = leadingPersonName;
     }
                 //保养日期
-    private Timestamp takecareDate;
+            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+        private Timestamp takecareDate;
         
     public Timestamp getTakecareDate() {
         return takecareDate;
@@ -88,7 +90,7 @@
         this.takecareDate = takecareDate;
     }
                 //保养负责人单位
-    private Long leadingPersonDepartmentId;
+            private Long leadingPersonDepartmentId;
         
     public Long getLeadingPersonDepartmentId() {
         return leadingPersonDepartmentId;
@@ -98,7 +100,7 @@
         this.leadingPersonDepartmentId = leadingPersonDepartmentId;
     }
                 //保养负责人单位名称
-    private String leadingPersonDepartmentName;
+            private String leadingPersonDepartmentName;
         
     public String getLeadingPersonDepartmentName() {
         return leadingPersonDepartmentName;
@@ -107,5 +109,15 @@
     public void setLeadingPersonDepartmentName(String leadingPersonDepartmentName) {
         this.leadingPersonDepartmentName = leadingPersonDepartmentName;
     }
-            
+                        //是否删除 0:未删除 1:删除
+            private Integer delFlag;
+        
+    public Integer getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(Integer delFlag) {
+        this.delFlag = delFlag;
+    }
+    
 }
\ No newline at end of file

--
Gitblit v1.9.2