与master分支同步

Lawrence

2020-12-16 44d216100b45c3337c593ee82ee68e7e0f35d24b

 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);