From db0b070e51db46e779b8d2ad1d4d213b712602cd Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 11 Jan 2021 17:04:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/org/springblade/modules/Netty/controller/nettyController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/Netty/controller/nettyController.java b/src/main/java/org/springblade/modules/Netty/controller/nettyController.java
index a049dcb..8def96a 100644
--- a/src/main/java/org/springblade/modules/Netty/controller/nettyController.java
+++ b/src/main/java/org/springblade/modules/Netty/controller/nettyController.java
@@ -140,7 +140,7 @@
response.setHeader("Access-Control-Allow-Credentials","true");
ConcurrentHashMap<String, Channel> channelHashMap = ChannelMap.getChannelHashMap();
System.out.println(channelHashMap);
- String s = catalogService.selectCatalogEqNUmber(pid);
+ String s = "";
if (s==null){
return R.success("暂无设备布防");
}
@@ -167,7 +167,7 @@
response.setHeader("Access-Control-Allow-Credentials","true");
ConcurrentHashMap<String, Channel> channelHashMap = ChannelMap.getChannelHashMap();
System.out.println(channelHashMap);
- String s = catalogService.selectCatalogEqNUmber(pid);
+ String s = "";
if (s==null){
return R.success("暂无设备撤防");
}
--
Gitblit v1.9.3