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/EmergencyDrillEvaluationPageRespDTO.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationPageRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationPageRespDTO.java
index ec5ba03..1624463 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationPageRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationPageRespDTO.java
@@ -5,7 +5,7 @@
import java.util.Date;
public class EmergencyDrillEvaluationPageRespDTO {
-
+ //应急预案名称
private String emergencyPlanName;
public String getEmergencyPlanName() {
@@ -15,18 +15,18 @@
public void setEmergencyPlanName(String emergencyPlanName) {
this.emergencyPlanName = emergencyPlanName;
}
-
+ //演练名称
private String drillName;
-
+ //演练地点
private String drillAddress;
-
+ //演练方式
private Byte drillWay;
-
+ //演练级别
private Byte drillLevel;
-
+ //计划演练日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date drillPlanDate;
-
+ //演练记录时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date drillRecordDate;
@@ -79,7 +79,7 @@
}
private Long id;
-
+ //演练实施id
private Long drillExecuteId;
--
Gitblit v1.9.2