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

648540858

2022-01-05 dc20ccfce84d46f86209309ea70ba81d0360e070

 src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java

@@ -40,7 +40,7 @@
                                         @RequestParam(required = false)String query,
                                         @RequestParam(required = false)Boolean online ){

        PageInfo<StreamPushItem> pushList = streamPushService.getPushList(page - 1, page - 1 + count);
        PageInfo<StreamPushItem> pushList = streamPushService.getPushList(page, count);
        return pushList;
    }