From fee66fde68610850d4c8c52df022b9d53a0cd3f7 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期三, 21 九月 2022 14:40:34 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf

---
 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentExpressReqDTO.java |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentExpressReqDTO.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentExpressReqDTO.java
index 1b9df7c..261c1b2 100644
--- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentExpressReqDTO.java
+++ b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/model/dto/req/AccidentExpressReqDTO.java
@@ -9,6 +9,16 @@
 
     private Long id;
 
+    private String createName;
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
+
     private String emergencyPrecautions;
 
     private String accidentCausesPreliminaryAnalysis;
@@ -17,8 +27,9 @@
 
     private Boolean casualties;
 
-    private String accidentCause;
+    private Byte accidentCause;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date occurrenceTime;
 
     private String occurrencePlace;
@@ -70,11 +81,11 @@
         this.casualties = casualties;
     }
 
-    public String getAccidentCause() {
+    public Byte getAccidentCause() {
         return accidentCause;
     }
 
-    public void setAccidentCause(String accidentCause) {
+    public void setAccidentCause(Byte accidentCause) {
         this.accidentCause = accidentCause;
     }
 

--
Gitblit v1.9.2