Merge pull request #12 from lawrencehj/master

648540858

2020-12-17 288059eecd5af4722841b1b1ac0d9131a1f02545

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