From fee66fde68610850d4c8c52df022b9d53a0cd3f7 Mon Sep 17 00:00:00 2001 From: zhangfeng <1603559716@qq.com> Date: 星期三, 21 九月 2022 14:40:34 +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 | 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