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/EmergencyDrillExecuteDetailRespDTO.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/EmergencyDrillExecuteDetailRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteDetailRespDTO.java index 70309b5..c34e629 100644 --- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteDetailRespDTO.java +++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteDetailRespDTO.java @@ -7,7 +7,7 @@ import java.util.List; public class EmergencyDrillExecuteDetailRespDTO { - + //记录人名称 private String recordUserName; public String getRecordUserName() { @@ -17,7 +17,7 @@ public void setRecordUserName(String recordUserName) { this.recordUserName = recordUserName; } - + // 演练名称 private String drillName; public String getDrillName() { @@ -29,18 +29,18 @@ } private Long id; - + //状态 0:待评价 1 :已评价 private Boolean status; - + //演练记录时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date drillRecordDate; - + //演练计划id private Long drillPlanId; - + //记录人uid private Long recordUserUid; - + //演练过程描述 private String processDesc; - + //人员列表 private List<EmergencyDrillExecuteUserRespDTO> userList; public Long getId() { -- Gitblit v1.9.2