Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

szy833

2022-01-16 4bd4f50b4165953018a9f9174056d29d087fdaee

 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/platformGbStream/PlatformGbStreamController.java

@@ -32,7 +32,7 @@
            @ApiImplicitParam(name = "page", value = "当前页", dataTypeClass = Integer.class),
            @ApiImplicitParam(name = "count", value = "每页条数", dataTypeClass = Integer.class),
    })
    @RequestMapping(value = "/list")
    @GetMapping(value = "/list")
    @ResponseBody
    public PageInfo<GbStream> list(@RequestParam(required = false)Integer page,
                                   @RequestParam(required = false)Integer count){