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
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainDetailRespDTO.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainDetailRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainDetailRespDTO.java
index 9bbbfb6..807fb4b 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainDetailRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainDetailRespDTO.java
@@ -8,7 +8,7 @@
import java.util.List;
public class EmergencySuppliesMaintainDetailRespDTO {
-
+ //物资名称
private String suppliesName;
public String getSuppliesName() {
@@ -20,12 +20,14 @@
}
private Long id;
-
+ //物资id
private Long suppliesId;
+ //保养id
private String maintainResult;
+ //保养时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date maintainTime;
-
+ //保养人id
private List<EmergencySuppliesMaintainUserRespDTO> userList;
public Long getId() {
--
Gitblit v1.9.2