From 81695c67562b55493a2e98263223c5440e28feed Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期三, 03 八月 2022 14:18:58 +0800
Subject: [PATCH] 合并fix

---
 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/EquipmentInfoService.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/EquipmentInfoService.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/EquipmentInfoService.java
index 2a36794..b72b70c 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/EquipmentInfoService.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/EquipmentInfoService.java
@@ -10,6 +10,8 @@
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 
 /**
@@ -28,4 +30,6 @@
     void addOrUpdate(EquipmentInfoSaveOrUpdate infoDto);
 
     Object statistics();
+
+    Map<Long,String> getDepName(Set<Long> collectDepIdSet);
 }
\ No newline at end of file

--
Gitblit v1.9.2