From ab2b3291cb9e21885ed878d60f5afd6640d830f3 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 19 九月 2022 18:05:24 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillPlanDetailRespDTO.java | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillPlanDetailRespDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillPlanDetailRespDTO.java
index 797e677..5c0ea9c 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillPlanDetailRespDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillPlanDetailRespDTO.java
@@ -7,7 +7,7 @@
import java.util.List;
public class EmergencyDrillPlanDetailRespDTO {
-
+ //预案名称
private String planName;
public String getPlanName() {
@@ -17,7 +17,7 @@
public void setPlanName(String planName) {
this.planName = planName;
}
-
+ //计划制定人名称
private String makingUserName;
public String getMakingUserName() {
@@ -29,46 +29,46 @@
}
private Long id;
-
+ //更新日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date gmtModitify;
-
+ //状态
private Integer status;
-
+ //计划制定日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date makingPlanDate;
-
+ //计划演练日期
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date drillPlanDate;
-
+ //计划制定人uid
private Long makingUserUid;
-
+ //计划制定部门ID
private Long makingDepartmentId;
-
+ //应急预案ID
private Long planId;
-
+ //主办部门ID
private Long departmentId;
-
+ //演练经费
private BigDecimal drillExpense;
-
+ //演练级别（数据字典）
private Byte drillLevel;
-
+ //演练地点
private String drillAddress;
-
+ //演练名称
private String drillName;
-
+ //演练方式（数据字典）
private Byte drillWay;
-
+ //保险措施
private String insuranceMeasures;
-
+ //备注
private String remark;
-
+ //演练目的
private String purpose;
-
+ //文件列表
private List<EmergencyDrillPlanFileRespDTO> fileList;
-
+ //人员列表
private List<EmergencyDrillPlanUserRespDTO> userList;
-
+ //负责人列表
private List<EmergencyDrillPlanUserRespDTO> chargeUserList;
public List<EmergencyDrillPlanUserRespDTO> getChargeUserList() {
--
Gitblit v1.9.2