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/EmergencyExecuteNumRPCResp.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 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 80a18b3..1065861 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
@@ -1,8 +1,6 @@
package com.gkhy.safePlatform.emergency.rpc.api.model.dto.resp;
-import com.gkhy.safePlatform.emergency.rpc.api.model.EmergencyDrillExecuteCountData;
-
import java.util.List;
import java.util.Map;
@@ -17,8 +15,10 @@
// 部门级别
private Integer deptLevel;
- // 名称+数据
- private List<Map<String ,String>> data;
+ // 父部门id
+ private Long parentDepId;
+
+ private List<EmergencyExecuteNumDetailRPCResp> detail;
public Long getDeptId() {
return deptId;
@@ -44,11 +44,19 @@
this.deptLevel = deptLevel;
}
- public List<Map<String, String>> getData() {
- return data;
+ public List<EmergencyExecuteNumDetailRPCResp> getDetail() {
+ return detail;
}
- public void setData(List<Map<String, String>> 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