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/model/dto/req/AccidentExpressReqDTO.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 5231914..5ceded1 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
@@ -1,6 +1,6 @@
package com.gkhy.safePlatform.incidentManage.model.dto.req;
-import com.gkhy.safePlatform.incidentManage.entity.AccidentExpressFileInfoDO;
+import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.util.List;
@@ -8,6 +8,16 @@
public class AccidentExpressReqDTO{
private Long id;
+
+ private String createName;
+
+ public String getCreateName() {
+ return createName;
+ }
+
+ public void setCreateName(String createName) {
+ this.createName = createName;
+ }
private String emergencyPrecautions;
@@ -19,6 +29,7 @@
private String accidentCause;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date occurrenceTime;
private String occurrencePlace;
--
Gitblit v1.9.2