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 | 60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 11 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 ac94ad4..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
@@ -4,18 +4,33 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import java.math.BigDecimal;
import java.util.Date;
@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;
+
+ private Date occurrenceTime;
+
+ private String occurrencePlace;
+
@TableId(type = IdType.AUTO)
private Long id;
private Long accidentExpressId;
-
- private Boolean status ;
private String accidentType;
@@ -27,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() {
@@ -71,4 +78,35 @@
this.accidentGrade = accidentGrade;
}
+ public String getAccidentName() {
+ return accidentName;
+ }
+
+ public void setAccidentName(String accidentName) {
+ this.accidentName = accidentName;
+ }
+
+ public Long getAccidentDepartmentId() {
+ return accidentDepartmentId;
+ }
+
+ public void setAccidentDepartmentId(Long accidentDepartmentId) {
+ this.accidentDepartmentId = accidentDepartmentId;
+ }
+
+ public Date getOccurrenceTime() {
+ return occurrenceTime;
+ }
+
+ public void setOccurrenceTime(Date occurrenceTime) {
+ this.occurrenceTime = occurrenceTime;
+ }
+
+ public String getOccurrencePlace() {
+ return occurrencePlace;
+ }
+
+ public void setOccurrencePlace(String occurrencePlace) {
+ this.occurrencePlace = occurrencePlace;
+ }
}
--
Gitblit v1.9.2