From 9ac04e8335b18ffbe2a3d7bc16f9f51a7404ec85 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期三, 27 七月 2022 10:28:06 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillPlanReqDTO.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillPlanReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillPlanReqDTO.java
index 7ec32da..b0a3fc6 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillPlanReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillPlanReqDTO.java
@@ -1,5 +1,7 @@
package com.gkhy.safePlatform.emergency.model.dto.req;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -10,8 +12,10 @@
private Integer status;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date makingPlanDate;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date drillPlanDate;
private Long makingUserUid;
--
Gitblit v1.9.2