From fee66fde68610850d4c8c52df022b9d53a0cd3f7 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: Wed, 21 Sep 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/EmergencySuppliesMaintainPageRespDTO.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/EmergencySuppliesMaintainPageRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainPageRespDTO.java
index 4085733..729578b 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainPageRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainPageRespDTO.java
@@ -7,11 +7,23 @@
import java.util.Date;
public class EmergencySuppliesMaintainPageRespDTO {
+ //物资名称
+ 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 maintainResult;
+ //保养时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date maintainTime;
--
Gitblit v1.9.2