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

648540858

2022-09-07 60c4f767f094d15711aa48b19b4e05e65999625a

 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;