From ab2b3291cb9e21885ed878d60f5afd6640d830f3 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Mon, 19 Sep 2022 18:05:24 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master
---
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentReportPageRespDTO.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentReportPageRespDTO.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentReportPageRespDTO.java
index 37cfe94..77e752a 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentReportPageRespDTO.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/resp/AccidentReportPageRespDTO.java
@@ -7,6 +7,16 @@
public class AccidentReportPageRespDTO {
+ private String deptName;
+
+ public String getDeptName() {
+ return deptName;
+ }
+
+ public void setDeptName(String deptName) {
+ this.deptName = deptName;
+ }
+
private String accidentName;
private Long accidentDepartmentId;
@@ -54,9 +64,9 @@
private Long accidentExpressId;
- private String accidentType;
+ private Byte accidentType;
- private String accidentGrade;
+ private Byte accidentGrade;
public Long getId() {
return id;
@@ -82,19 +92,19 @@
this.accidentExpressId = accidentExpressId;
}
- public String getAccidentType() {
+ public Byte getAccidentType() {
return accidentType;
}
- public void setAccidentType(String accidentType) {
+ public void setAccidentType(Byte accidentType) {
this.accidentType = accidentType;
}
- public String getAccidentGrade() {
+ public Byte getAccidentGrade() {
return accidentGrade;
}
- public void setAccidentGrade(String accidentGrade) {
+ public void setAccidentGrade(Byte accidentGrade) {
this.accidentGrade = accidentGrade;
}
--
Gitblit v1.9.2