From 9a73660fa673120de8fb4fdacdfe2a9f47fe9fbb Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期二, 08 十一月 2022 08:38:10 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf
---
emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/dto/resp/EmergencyExecuteTimeRPCResp.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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..81c7ebc 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
@@ -10,13 +10,13 @@
private String deptName;
// 部门级别
- private Integer deptLevel;
+ private Byte deptLevel;
+
+ // 父部门id
+ private Long parentDepId;
//上次演练的时间
private String lastTime;
-
- // 距离上次演练的天数
- private Integer days;
public Long getDeptId() {
return deptId;
@@ -34,11 +34,11 @@
this.deptName = deptName;
}
- public Integer getDeptLevel() {
+ public Byte getDeptLevel() {
return deptLevel;
}
- public void setDeptLevel(Integer deptLevel) {
+ public void setDeptLevel(Byte deptLevel) {
this.deptLevel = deptLevel;
}
@@ -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