From c9529bd19a8d61666b71824dd751682c1e9dc288 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 15 八月 2022 10:39:31 +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/entity/AccidentReportInfoPageDO.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportInfoPageDO.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportInfoPageDO.java
index 7784288..120a251 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportInfoPageDO.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/entity/AccidentReportInfoPageDO.java
@@ -9,6 +9,16 @@
@TableName("accident_report")
public class AccidentReportInfoPageDO {
+ private Integer status;
+
+ public Integer getStatus() {
+ return status;
+ }
+
+ public void setStatus(Integer status) {
+ this.status = status;
+ }
+
private String accidentName;
private Long accidentDepartmentId;
@@ -22,8 +32,6 @@
private Long accidentExpressId;
- private Boolean status ;
-
private String accidentType;
private String accidentGrade;
@@ -34,14 +42,6 @@
public void setId(Long id) {
this.id = id;
- }
-
- public Boolean getStatus() {
- return status;
- }
-
- public void setStatus(Boolean status) {
- this.status = status;
}
public Long getAccidentExpressId() {
--
Gitblit v1.9.2