Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safeP...

songhuangfeng123

2022-08-15 c9529bd19a8d61666b71824dd751682c1e9dc288

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java

@@ -219,6 +219,9 @@
        if(typeMng != null){
            infoDto.setEquipmentTypeName(typeMng.getTypeName());
        }

        // TODO 调用应急预案RPC
        infoDto.setEmergencePlanName("");
        return infoDto;
    }