From 5703d0e9865df3ba05bb02bc382ce59fbf5f7da0 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 12 八月 2022 16:59:06 +0800
Subject: [PATCH] Merge branch 'genchuang' of https://sinanoaq.cn:8888/r/safePlatform-out into master

---
 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentReportReqDTO.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentReportReqDTO.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentReportReqDTO.java
index 6afa48d..839b073 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentReportReqDTO.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentReportReqDTO.java
@@ -8,6 +8,16 @@
 
 public class AccidentReportReqDTO {
 
+    private Integer status;
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
     private String fillInUserName;
 
     public String getFillInUserName() {
@@ -36,6 +46,7 @@
 
     private String accidentCause;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date reportDeadline;
 
     private String accidentLevel;
@@ -52,6 +63,7 @@
 
     private Long fillInUserUid;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date fillInTime;
 
     private String relevantPersonnelRecords;

--
Gitblit v1.9.2