From 5ed84eaec030109b0e6b77ae2667ed56e959871b Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 12 八月 2022 16:58:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java
index 1c87836..958d9fb 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java
+++ b/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;
}
--
Gitblit v1.9.2