Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

Fang

2022-03-07 bea63f67e75ea6c38d946c2ee463260fcf815f87

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

@@ -74,7 +74,7 @@
    @Override
    public StreamInfo getStreamInfoByAppAndStream(MediaServerItem mediaInfo, String app, String stream, Object tracks, String addr) {
        StreamInfo streamInfoResult = new StreamInfo();
        streamInfoResult.setStreamId(stream);
        streamInfoResult.setStream(stream);
        streamInfoResult.setApp(app);
        if (addr == null) {
            addr = mediaInfo.getStreamIp();