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

648540858

2022-03-11 45e9fc880c61e12d6415755ee2a29f79fcf81fbb

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

@@ -132,7 +132,7 @@
                }else {
                    streamLive = true;
                    StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream(
                            mediaInfo, param.getApp(), param.getStream(), null);
                            mediaInfo, param.getApp(), param.getStream(), null, null);
                    wvpResult.setData(streamInfo);

                }