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/EmergencyDrillExecutePageRespDTO.java | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecutePageRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecutePageRespDTO.java index 08ff5e3..09f2847 100644 --- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecutePageRespDTO.java +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecutePageRespDTO.java @@ -5,18 +5,18 @@ import java.util.Date; public class EmergencyDrillExecutePageRespDTO { - + //演练名称 private String drillName; - + //演练地点 private String drillAddress; - + //演练方式 private Byte drillWay; - + //演练级别 private Byte drillLevel; - + //计划演练日期 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date drillPlanDate; - + //预案名称 private String emergencyPlanName; public String getDrillName() { @@ -68,12 +68,12 @@ } private Long id; - + //状态 0:待评价 1 :已评价 private Boolean status; - + //演练记录时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date drillRecordDate; - + //演练计划id private Long drillPlanId; public Long getId() { -- Gitblit v1.9.2