From 5703d0e9865df3ba05bb02bc382ce59fbf5f7da0 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 12 八月 2022 16:59:06 +0800
Subject: [PATCH] Merge branch 'genchuang' of https://sinanoaq.cn:8888/r/safePlatform-out into master
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillEvaluationReqDTO.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillEvaluationReqDTO.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillEvaluationReqDTO.java
index 8be8076..9c41e4b 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillEvaluationReqDTO.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillEvaluationReqDTO.java
@@ -11,7 +11,8 @@
private Long id;
- private Long drillPlanId;
+ // 应急演练实施的id 帮助数据进行筛选
+ private Long drillExecuteId;
private String suitable;
@@ -55,12 +56,12 @@
this.id = id;
}
- public Long getDrillPlanId() {
- return drillPlanId;
+ public Long getDrillExecuteId() {
+ return drillExecuteId;
}
- public void setDrillPlanId(Long drillPlanId) {
- this.drillPlanId = drillPlanId;
+ public void setDrillExecuteId(Long drillExecuteId) {
+ this.drillExecuteId = drillExecuteId;
}
public String getSuitable() {
@@ -203,7 +204,7 @@
public String toString() {
return "EmergencyDrillEvaluationReqDTO{" +
"id=" + id +
- ", drillPlanId=" + drillPlanId +
+ ", drillExecuteId=" + drillExecuteId +
", suitable='" + suitable + '\'' +
", sufficient='" + sufficient + '\'' +
", arrival='" + arrival + '\'' +
--
Gitblit v1.9.2