From 9a73660fa673120de8fb4fdacdfe2a9f47fe9fbb Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: Tue, 08 Nov 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/resp/EmergencySuppliesInspectPageRespDTO.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectPageRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectPageRespDTO.java
index ed6da8f..40b0f42 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectPageRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectPageRespDTO.java
@@ -7,11 +7,23 @@
import java.util.Date;
public class EmergencySuppliesInspectPageRespDTO {
+ //物资名称
+ private String suppliesName;
+
+ public String getSuppliesName() {
+ return suppliesName;
+ }
+
+ public void setSuppliesName(String suppliesName) {
+ this.suppliesName = suppliesName;
+ }
private Long id;
-
+ //物资id
private Long suppliesId;
+ //检查结果
private String inspectResult;
+ //检查时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date inspectTime;
--
Gitblit v1.9.2