From 9a73660fa673120de8fb4fdacdfe2a9f47fe9fbb Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期二, 08 十一月 2022 08:38:10 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainReqDTO.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainReqDTO.java
index d2c4e19..744d566 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainReqDTO.java
@@ -1,16 +1,21 @@
package com.gkhy.safePlatform.emergency.model.dto.req;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.util.Date;
import java.util.List;
public class EmergencySuppliesMaintainReqDTO {
private Long id;
-
+ //物资id
private Long suppliesId;
+ //保养结果
private String maintainResult;
+ //保养时间
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date maintainTime;
-
+ //包养人列表
private List<EmergencySuppliesMaintainUserReqDTO> userList;
--
Gitblit v1.9.2