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

648540858

2024-03-08 1fcdf5a8f369e020e78d524db2fe3cc7ffc86293

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

old mode 100644
new mode 100755
@@ -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);
}