Merge branch 'wvp-28181-2.0'

648540858

2023-01-13 dea44dcd78418ed3e7f191a73cee2b81a7a0019f

 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java

@@ -99,7 +99,7 @@
   @GetMapping("/devices")
   public PageInfo<Device> devices(int page, int count){
      
      return storager.queryVideoDeviceList(page, count);
      return storager.queryVideoDeviceList(page, count,null);
   }

   /**