Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

panlinlin

2021-01-07 059a5a678ab21738c3fecb9e2bd1e2dc47220a4f

 src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java

@@ -112,8 +112,6 @@
      return new PageInfo<>(all);
   }



   @Override
   public List<DeviceChannel> queryChannelsByDeviceId(String deviceId) {
      return deviceChannelMapper.queryChannelsByDeviceId(deviceId, null,null, null, null);