From 357935fb2785dc79f4f47ffa7e1c503bc8cea376 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 16 九月 2022 15:19:50 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master

---
 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/KeypointEquipmentInfoImportExcel.java |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/KeypointEquipmentInfoImportExcel.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/KeypointEquipmentInfoImportExcel.java
index 9217946..0e8f8fc 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/KeypointEquipmentInfoImportExcel.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/KeypointEquipmentInfoImportExcel.java
@@ -33,7 +33,7 @@
     private Long responsibilityPersonId;
     //装置部位分类 1：关键装置 2：重点部位
     @ExcelCell(index = 9)
-    private Integer partType;
+    private Byte partType;
     //检查周期
     @ExcelCell(index = 10)
     private String checkCycle;
@@ -68,7 +68,7 @@
     public void setEquipmentTypeId(Long equipmentTypeId) {
         this.equipmentTypeId = equipmentTypeId;
     }
-    //名称        
+    //名称
     public String getName() {
         return name;
     }
@@ -76,7 +76,7 @@
     public void setName(String name) {
         this.name = name;
     }
-    //单位部门外键        
+    //单位部门外键
     public Long getDepartmentId() {
         return departmentId;
     }
@@ -84,7 +84,7 @@
     public void setDepartmentId(Long departmentId) {
         this.departmentId = departmentId;
     }
-    //具体位置        
+    //具体位置
     public String getPosition() {
         return position;
     }
@@ -92,7 +92,7 @@
     public void setPosition(String position) {
         this.position = position;
     }
-    //负责人姓名        
+    //负责人姓名
     public String getLeadingPersonName() {
         return leadingPersonName;
     }
@@ -100,7 +100,7 @@
     public void setLeadingPersonName(String leadingPersonName) {
         this.leadingPersonName = leadingPersonName;
     }
-    //联系人/外键        
+    //联系人/外键
     public Long getConnectPersonId() {
         return connectPersonId;
     }
@@ -108,7 +108,7 @@
     public void setConnectPersonId(Long connectPersonId) {
         this.connectPersonId = connectPersonId;
     }
-    //录入人/外键        
+    //录入人/外键
     public Long getInputPersonId() {
         return inputPersonId;
     }
@@ -116,7 +116,7 @@
     public void setInputPersonId(Long inputPersonId) {
         this.inputPersonId = inputPersonId;
     }
-    //责任人/外键        
+    //责任人/外键
     public Long getResponsibilityPersonId() {
         return responsibilityPersonId;
     }
@@ -124,15 +124,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;
     }
@@ -140,7 +140,7 @@
     public void setCheckCycle(String checkCycle) {
         this.checkCycle = checkCycle;
     }
-    //应急预案/外键        
+    //应急预案/外键
     public Long getEmergencePlanId() {
         return emergencePlanId;
     }
@@ -148,7 +148,7 @@
     public void setEmergencePlanId(Long emergencePlanId) {
         this.emergencePlanId = emergencePlanId;
     }
-    //主要危险有害因素        
+    //主要危险有害因素
     public String getDangerousElement() {
         return dangerousElement;
     }
@@ -156,7 +156,7 @@
     public void setDangerousElement(String dangerousElement) {
         this.dangerousElement = dangerousElement;
     }
-    //易导致风险        
+    //易导致风险
     public String getToDangerous() {
         return toDangerous;
     }
@@ -164,7 +164,7 @@
     public void setToDangerous(String toDangerous) {
         this.toDangerous = toDangerous;
     }
-    //应急处置措施        
+    //应急处置措施
     public String getTreatment() {
         return treatment;
     }
@@ -172,7 +172,7 @@
     public void setTreatment(String treatment) {
         this.treatment = treatment;
     }
-    //现场图片        
+    //现场图片
     public String getScenePic() {
         return scenePic;
     }
@@ -180,5 +180,5 @@
     public void setScenePic(String scenePic) {
         this.scenePic = scenePic;
     }
-            
-}
\ No newline at end of file
+
+}

--
Gitblit v1.9.2