From 357935fb2785dc79f4f47ffa7e1c503bc8cea376 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 16 九月 2022 15:19:50 +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, 36 insertions(+), 6 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 c21c1da..797e677 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
@@ -8,6 +8,26 @@
public class EmergencyDrillPlanDetailRespDTO {
+ private String planName;
+
+ public String getPlanName() {
+ return planName;
+ }
+
+ public void setPlanName(String planName) {
+ this.planName = planName;
+ }
+
+ private String makingUserName;
+
+ public String getMakingUserName() {
+ return makingUserName;
+ }
+
+ public void setMakingUserName(String makingUserName) {
+ this.makingUserName = makingUserName;
+ }
+
private Long id;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -31,13 +51,13 @@
private BigDecimal drillExpense;
- private String drillLevel;
+ private Byte drillLevel;
private String drillAddress;
private String drillName;
- private String drillWay;
+ private Byte drillWay;
private String insuranceMeasures;
@@ -48,6 +68,16 @@
private List<EmergencyDrillPlanFileRespDTO> fileList;
private List<EmergencyDrillPlanUserRespDTO> userList;
+
+ private List<EmergencyDrillPlanUserRespDTO> chargeUserList;
+
+ public List<EmergencyDrillPlanUserRespDTO> getChargeUserList() {
+ return chargeUserList;
+ }
+
+ public void setChargeUserList(List<EmergencyDrillPlanUserRespDTO> chargeUserList) {
+ this.chargeUserList = chargeUserList;
+ }
public Long getId() {
return id;
@@ -129,11 +159,11 @@
this.drillExpense = drillExpense;
}
- public String getDrillLevel() {
+ public Byte getDrillLevel() {
return drillLevel;
}
- public void setDrillLevel(String drillLevel) {
+ public void setDrillLevel(Byte drillLevel) {
this.drillLevel = drillLevel;
}
@@ -153,11 +183,11 @@
this.drillName = drillName;
}
- public String getDrillWay() {
+ public Byte getDrillWay() {
return drillWay;
}
- public void setDrillWay(String drillWay) {
+ public void setDrillWay(Byte drillWay) {
this.drillWay = drillWay;
}
--
Gitblit v1.9.2