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

648540858

2022-04-21 d7bfd9bfa7af26d6c76fe771bb8cfe0d3f84da5e

 web_src/src/components/dialog/chooseChannelForStream.vue

@@ -174,7 +174,7 @@
                    page: that.currentPage,
                    count: that.count,
                    query: that.searchSrt,
                    pushing: that.online,
                    pushing: that.pushing,
                    platformId: that.platformId,
                    catalogId: that.catalogId,
                    mediaServerId: that.mediaServerId