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/AccidentReportReqDTO.java | 24 ++++++++++++++++++++++++
1 files changed, 24 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 4eb0265..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
@@ -1,10 +1,32 @@
package com.gkhy.safePlatform.incidentManage.model.dto.req;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
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() {
+ return fillInUserName;
+ }
+
+ public void setFillInUserName(String fillInUserName) {
+ this.fillInUserName = fillInUserName;
+ }
private Long id;
@@ -24,6 +46,7 @@
private String accidentCause;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date reportDeadline;
private String accidentLevel;
@@ -40,6 +63,7 @@
private Long fillInUserUid;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date fillInTime;
private String relevantPersonnelRecords;
--
Gitblit v1.9.2