From cd02923a7ce1ffa004b3abbb7af67ab6173dd99d Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期一, 25 三月 2024 10:59:40 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java
index f5f875d..406f294 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java
@@ -1,14 +1,17 @@
package com.gkhy.safePlatform.equipment.entity;
+import java.sql.Timestamp;
+import com.gkhy.safePlatform.equipment.entity.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 重点监管装置/设备 详细信息(KeypointEquipmentInfo)表实体类
*
* @author xurui
- * @since 2022-08-09 09:39:39
+ * @since 2022-08-29 08:37:54
*/
@SuppressWarnings("serial")
@TableName("keypoint_equipment_info")
@@ -136,13 +139,13 @@
this.responsibilityPersonName = responsibilityPersonName;
}
//装置部位分类 1：关键装置 2：重点部位
- private Integer partType;
+ private Byte partType;
- public Integer getPartType() {
+ public Byte getPartType() {
return partType;
}
- public void setPartType(Integer partType) {
+ public void setPartType(Byte partType) {
this.partType = partType;
}
//检查周期
@@ -205,5 +208,25 @@
public void setScenePic(String scenePic) {
this.scenePic = scenePic;
}
+ //备注
+ private String memo;
-}
\ No newline at end of file
+ public String getMemo() {
+ return memo;
+ }
+
+ public void setMemo(String memo) {
+ this.memo = memo;
+ }
+ //是否删除 0:未删除 1:删除
+ private Integer delFlag;
+
+ public Integer getDelFlag() {
+ return delFlag;
+ }
+
+ public void setDelFlag(Integer delFlag) {
+ this.delFlag = delFlag;
+ }
+
+}
--
Gitblit v1.9.2