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

648540858

2022-10-19 c5b16e058dd1d517abea9a475897d9333c6e2e2e

 src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java

@@ -73,7 +73,6 @@
                }else {
                    streamInfo = getStreamInfoByAppAndStream(mediaInfo, app, stream, tracks, addr,null);
                }

            }
        }
        return streamInfo;