From ab2b3291cb9e21885ed878d60f5afd6640d830f3 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 19 九月 2022 18:05:24 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectDetailRespDTO.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/EmergencySuppliesInspectDetailRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectDetailRespDTO.java
index edab939..2d311b1 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectDetailRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectDetailRespDTO.java
@@ -8,7 +8,7 @@
import java.util.List;
public class EmergencySuppliesInspectDetailRespDTO {
-
+ //物资名称
private String suppliesName;
public String getSuppliesName() {
@@ -20,12 +20,14 @@
}
private Long id;
-
+ //物资id
private Long suppliesId;
+ //检查结果
private String inspectResult;
+ //检查日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date inspectTime;
-
+ //检查人列表
private List<EmergencySuppliesInspectUserRespDTO> userList;
public Long getId() {
--
Gitblit v1.9.2