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
---
incident-manage/incident-manage-rpc-api/src/main/java/com/gkhy/safePlatform/incidentManage/rpc/api/model/dto/resp/IncidentManageRPCResp.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/incident-manage/incident-manage-rpc-api/src/main/java/com/gkhy/safePlatform/incidentManage/rpc/api/model/dto/resp/IncidentManageRPCResp.java b/incident-manage/incident-manage-rpc-api/src/main/java/com/gkhy/safePlatform/incidentManage/rpc/api/model/dto/resp/IncidentManageRPCResp.java
index 4c16e49..7bdfcf3 100644
--- a/incident-manage/incident-manage-rpc-api/src/main/java/com/gkhy/safePlatform/incidentManage/rpc/api/model/dto/resp/IncidentManageRPCResp.java
+++ b/incident-manage/incident-manage-rpc-api/src/main/java/com/gkhy/safePlatform/incidentManage/rpc/api/model/dto/resp/IncidentManageRPCResp.java
@@ -2,7 +2,6 @@
import java.util.List;
-import java.util.Map;
public class IncidentManageRPCResp {
@@ -14,6 +13,9 @@
// 部门级别
private Integer deptLevel;
+
+ // 父部门id
+ private Long parentDepId;
// 名称+数据
private List<IncidentManageCountRPCResp> data;
@@ -42,6 +44,14 @@
this.deptLevel = deptLevel;
}
+ public Long getParentDepId() {
+ return parentDepId;
+ }
+
+ public void setParentDepId(Long parentDepId) {
+ this.parentDepId = parentDepId;
+ }
+
public List<IncidentManageCountRPCResp> getData() {
return data;
}
--
Gitblit v1.9.2