From 9f122a41255d18f04a82d8be3b038a95c2c18d95 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 20 九月 2022 16:26:08 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master
---
emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/dto/resp/EmergencyExecuteTimeRPCResp.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/dto/resp/EmergencyExecuteTimeRPCResp.java b/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/dto/resp/EmergencyExecuteTimeRPCResp.java
index d0a02b1..40007a0 100644
--- a/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/dto/resp/EmergencyExecuteTimeRPCResp.java
+++ b/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/dto/resp/EmergencyExecuteTimeRPCResp.java
@@ -12,11 +12,11 @@
// 部门级别
private Integer deptLevel;
+ // 父部门id
+ private Long parentDepId;
+
//上次演练的时间
private String lastTime;
-
- // 距离上次演练的天数
- private Integer days;
public Long getDeptId() {
return deptId;
@@ -50,11 +50,11 @@
this.lastTime = lastTime;
}
- public Integer getDays() {
- return days;
+ public Long getParentDepId() {
+ return parentDepId;
}
- public void setDays(Integer days) {
- this.days = days;
+ public void setParentDepId(Long parentDepId) {
+ this.parentDepId = parentDepId;
}
}
--
Gitblit v1.9.2