Merge branch '648540858:master' into master

Iwan Lebron

2024-08-01 cfcda861640644e3597eff70775bfaf7186a55ad

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

@@ -112,9 +112,9 @@
    @ResponseBody
    @Operation(summary = "中止一个推流", security = @SecurityRequirement(name = JwtUtils.HEADER))
    @Parameter(name = "app", description = "应用名", required = true)
    @Parameter(name = "streamId", description = "流id", required = true)
    public void stop(String app, String streamId){
        if (!streamPushService.stop(app, streamId)){
    @Parameter(name = "stream", description = "流id", required = true)
    public void stop(String app, String stream){
        if (!streamPushService.stop(app, stream)){
            throw new ControllerException(ErrorCode.ERROR100);
        }
    }