Merge branches 'dev_grid_platform' and 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java

@@ -71,7 +71,12 @@ public class EpmetMessageOpenFeignClientFallback implements EpmetMessageOpenFeig
     }
 
     @Override
-    public Result ackSystemMsgByMQ(SystemMsgFormDTO form) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "ackSystemMsgByMQ", form);
+    public Result blockedMqMsgScan() {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "blockedMqMsgScan");
+    }
+
+    @Override
+    public Result penddingMqMsgScan() {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "penddingMqMsgScan");
     }
 }