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

panlinlin

2021-01-08 7e581e9d3a0e32be5e90e453f4283d70d895a634

 src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java

@@ -168,6 +168,7 @@
        }
        cmder.streamByeCmd(streamInfo.getStreamId());
        redisCatchStorage.stopPlay(streamInfo);
        storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
        return null;
    }