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/EmergencyPlanPageRespDTO.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java
index 811526b..5aeda83 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java
@@ -50,6 +50,7 @@
this.checkApprove = checkApprove;
}
+ //编写人名称
private String authorName;
public String getAuthorName() {
@@ -61,15 +62,15 @@
}
private Long id;
-
+ // 预案名称
private String name ;
-
+ //预案状态
private Integer status ;
-
+ //预案类型（数据字典）
private Byte type;
-
+ //预案级别（数据字典）
private Byte level;
-
+ //发布实施日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date releaseDate;
--
Gitblit v1.9.2