From fee66fde68610850d4c8c52df022b9d53a0cd3f7 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: Wed, 21 Sep 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/model/dto/resp/KeypointEquipmentInfoExcel.java | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoExcel.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoExcel.java
index a021dfa..e26bc0a 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoExcel.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/resp/KeypointEquipmentInfoExcel.java
@@ -40,7 +40,7 @@
private Long responsibilityPersonId;
//装置部位分类 1：关键装置 2：重点部位
@ExcelCell(index = 9)
- private Integer partType;
+ private Byte partType;
//检查周期
@ExcelCell(index = 10)
private String checkCycle;
@@ -59,9 +59,9 @@
//现场图片
@ExcelCell(index = 15)
private String scenePic;
-
+
private Date createTime;
-
+
private Date updateTime;
public String getDepartmentName() {
@@ -206,7 +206,7 @@
public void setId(Long id) {
this.id = id;
}
- //类型/类别外键
+ //类型/类别外键
public Long getEquipmentTypeId() {
return equipmentTypeId;
}
@@ -214,7 +214,7 @@
public void setEquipmentTypeId(Long equipmentTypeId) {
this.equipmentTypeId = equipmentTypeId;
}
- //名称
+ //名称
public String getName() {
return name;
}
@@ -222,7 +222,7 @@
public void setName(String name) {
this.name = name;
}
- //单位部门外键
+ //单位部门外键
public Long getDepartmentId() {
return departmentId;
}
@@ -230,7 +230,7 @@
public void setDepartmentId(Long departmentId) {
this.departmentId = departmentId;
}
- //具体位置
+ //具体位置
public String getPosition() {
return position;
}
@@ -238,7 +238,7 @@
public void setPosition(String position) {
this.position = position;
}
- //负责人姓名
+ //负责人姓名
public String getLeadingPersonName() {
return leadingPersonName;
}
@@ -246,7 +246,7 @@
public void setLeadingPersonName(String leadingPersonName) {
this.leadingPersonName = leadingPersonName;
}
- //联系人/外键
+ //联系人/外键
public Long getConnectPersonId() {
return connectPersonId;
}
@@ -254,7 +254,7 @@
public void setConnectPersonId(Long connectPersonId) {
this.connectPersonId = connectPersonId;
}
- //录入人/外键
+ //录入人/外键
public Long getInputPersonId() {
return inputPersonId;
}
@@ -262,7 +262,7 @@
public void setInputPersonId(Long inputPersonId) {
this.inputPersonId = inputPersonId;
}
- //责任人/外键
+ //责任人/外键
public Long getResponsibilityPersonId() {
return responsibilityPersonId;
}
@@ -270,15 +270,15 @@
public void setResponsibilityPersonId(Long responsibilityPersonId) {
this.responsibilityPersonId = responsibilityPersonId;
}
- //装置部位分类 1：关键装置 2：重点部位
- public Integer getPartType() {
+ //装置部位分类 1：关键装置 2：重点部位
+ public Byte getPartType() {
return partType;
}
- public void setPartType(Integer partType) {
+ public void setPartType(Byte partType) {
this.partType = partType;
}
- //检查周期
+ //检查周期
public String getCheckCycle() {
return checkCycle;
}
@@ -286,7 +286,7 @@
public void setCheckCycle(String checkCycle) {
this.checkCycle = checkCycle;
}
- //应急预案/外键
+ //应急预案/外键
public Long getEmergencePlanId() {
return emergencePlanId;
}
@@ -294,7 +294,7 @@
public void setEmergencePlanId(Long emergencePlanId) {
this.emergencePlanId = emergencePlanId;
}
- //主要危险有害因素
+ //主要危险有害因素
public String getDangerousElement() {
return dangerousElement;
}
@@ -302,7 +302,7 @@
public void setDangerousElement(String dangerousElement) {
this.dangerousElement = dangerousElement;
}
- //易导致风险
+ //易导致风险
public String getToDangerous() {
return toDangerous;
}
@@ -310,7 +310,7 @@
public void setToDangerous(String toDangerous) {
this.toDangerous = toDangerous;
}
- //应急处置措施
+ //应急处置措施
public String getTreatment() {
return treatment;
}
@@ -318,7 +318,7 @@
public void setTreatment(String treatment) {
this.treatment = treatment;
}
- //现场图片
+ //现场图片
public String getScenePic() {
return scenePic;
}
@@ -326,7 +326,7 @@
public void setScenePic(String scenePic) {
this.scenePic = scenePic;
}
-
+
public Date getCreateTime() {
return createTime;
}
@@ -334,7 +334,7 @@
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
-
+
public Date getUpdateTime() {
return updateTime;
}
@@ -342,4 +342,4 @@
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.2