From fee66fde68610850d4c8c52df022b9d53a0cd3f7 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期三, 21 九月 2022 14:40:34 +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/EquipmentRepairDetail.java | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java
index 572afcb..4de2c16 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java
@@ -16,8 +16,8 @@
@SuppressWarnings("serial")
@TableName("equipment_repair_detail")
public class EquipmentRepairDetail extends BaseDomain {
-
-
+
+
@TableId(type = IdType.AUTO)
private Long id;
public Long getId() {
@@ -30,7 +30,7 @@
//具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施 3:重点监管装置/设备
private Integer infoTpe;
-
+
public Integer getInfoTpe() {
return infoTpe;
}
@@ -40,7 +40,7 @@
}
//设备ID/外键
private Long equipmentId;
-
+
public Long getEquipmentId() {
return equipmentId;
}
@@ -50,7 +50,7 @@
}
//维修负责人/外键
private Long repairPersonId;
-
+
public Long getRepairPersonId() {
return repairPersonId;
}
@@ -60,7 +60,7 @@
}
//维修负责人名称
private String repairPersonName;
-
+
public String getRepairPersonName() {
return repairPersonName;
}
@@ -71,7 +71,7 @@
//维修开始日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp repairStartDate;
-
+
public Timestamp getRepairStartDate() {
return repairStartDate;
}
@@ -82,7 +82,7 @@
//维修结束日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Timestamp repairEndDate;
-
+
public Timestamp getRepairEndDate() {
return repairEndDate;
}
@@ -92,7 +92,7 @@
}
//维修负责人单位/外键
private Long repairPersonDepartmentId;
-
+
public Long getRepairPersonDepartmentId() {
return repairPersonDepartmentId;
}
@@ -102,7 +102,7 @@
}
//维修负责人单位名称
private String repairPersonDepartmentName;
-
+
public String getRepairPersonDepartmentName() {
return repairPersonDepartmentName;
}
@@ -112,7 +112,7 @@
}
//维修情况
private String repairMemo;
-
+
public String getRepairMemo() {
return repairMemo;
}
@@ -121,18 +121,18 @@
this.repairMemo = repairMemo;
}
//维修状态 1：维修中 2：已修好
- private Integer repairStatus;
-
- public Integer getRepairStatus() {
+ private Byte repairStatus;
+
+ public Byte getRepairStatus() {
return repairStatus;
}
- public void setRepairStatus(Integer repairStatus) {
+ public void setRepairStatus(Byte repairStatus) {
this.repairStatus = repairStatus;
}
//设施异常项
private String exceptionInfo;
-
+
public String getExceptionInfo() {
return exceptionInfo;
}
@@ -142,7 +142,7 @@
}
//是否删除 0:未删除 1:删除
private Integer delFlag;
-
+
public Integer getDelFlag() {
return delFlag;
}
@@ -150,5 +150,5 @@
public void setDelFlag(Integer delFlag) {
this.delFlag = delFlag;
}
-
-}
\ No newline at end of file
+
+}
--
Gitblit v1.9.2