From f875c1da278428d30355afac3eefa47ee96132e3 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 06 十一月 2020 12:48:54 +0800
Subject: [PATCH] Merge pull request #9 from lawrencehj/master
---
src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java
index 8c0ecfb..34a02ee 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java
@@ -138,7 +138,7 @@
DeviceChannel deviceChannel = storager.queryChannel(deviceId,channelId);
if (deviceChannel == null) {
PageResult<DeviceChannel> deviceChannelPageResult = new PageResult<>();
- new ResponseEntity<>(deviceChannelPageResult,HttpStatus.OK);
+ return new ResponseEntity<>(deviceChannelPageResult,HttpStatus.OK);
}
PageResult pageResult = storager.querySubChannels(deviceId, channelId, query, channelType, online, page, count);
--
Gitblit v1.8.0