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/EmergencyExecuteNumRPCResp.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/dto/resp/EmergencyExecuteNumRPCResp.java b/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/dto/resp/EmergencyExecuteNumRPCResp.java
index 4171cc1..f58915c 100644
--- a/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/dto/resp/EmergencyExecuteNumRPCResp.java
+++ b/emergency/emergency-rpc-api/src/main/java/com/gkhy/safePlatform/emergency/rpc/api/model/dto/resp/EmergencyExecuteNumRPCResp.java
@@ -13,10 +13,12 @@
private String deptName;
// 部门级别
- private Integer deptLevel;
+ private Byte deptLevel;
- // 名称+数据 1如果为查询的是年：返回的name为月份 2如果查询的是月，返回的name为天
- private List<Map<String ,Integer>> data;
+ // 父部门id
+ private Long parentDepId;
+
+ private List<EmergencyExecuteNumDetailRPCResp> detail;
public Long getDeptId() {
return deptId;
@@ -34,19 +36,27 @@
this.deptName = deptName;
}
- public Integer getDeptLevel() {
+ public Byte getDeptLevel() {
return deptLevel;
}
- public void setDeptLevel(Integer deptLevel) {
+ public void setDeptLevel(Byte deptLevel) {
this.deptLevel = deptLevel;
}
- public List<Map<String, Integer>> getData() {
- return data;
+ public List<EmergencyExecuteNumDetailRPCResp> getDetail() {
+ return detail;
}
- public void setData(List<Map<String, Integer>> data) {
- this.data = data;
+ public void setDetail(List<EmergencyExecuteNumDetailRPCResp> detail) {
+ this.detail = detail;
+ }
+
+ public Long getParentDepId() {
+ return parentDepId;
+ }
+
+ public void setParentDepId(Long parentDepId) {
+ this.parentDepId = parentDepId;
}
}
--
Gitblit v1.9.2