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

648540858

2021-11-29 019827fd35f84465ee503fcc248b12a045da44d2

 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);
}