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

hotcoffie

2021-12-01 a16b4f71ec5a4d3d526c9c35a1e1f7843a49e921

 src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.java

@@ -65,4 +65,10 @@
     * @return
     */
    JSONObject getFFmpegCMDs(MediaServerItem mediaServerItem);

    /**
     * 根据app与stream获取streamProxy
     * @return
     */
    StreamProxyItem getStreamProxyByAppAndStream(String app, String streamId);
}