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

648540858

2023-06-29 c014a90cc6a294dfc2aac740be87e75f44193a29

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

@@ -40,5 +40,5 @@
     * @param stream
     * @return
     */
    StreamInfo getStreamInfoByAppAndStream(MediaServerItem mediaInfo, String app, String stream, Object tracks, String addr, String callId);
    StreamInfo getStreamInfoByAppAndStream(MediaServerItem mediaInfo, String app, String stream, Object tracks, String addr, String callId, boolean isPlay);
}