合并fix

songhuangfeng123

2022-08-03 81695c67562b55493a2e98263223c5440e28feed

 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);
}