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

648540858

2021-10-27 e259be9268db90b4e73a325abea24ad59ff0e4e3

 web_src/src/components/PushVideoList.vue

@@ -154,7 +154,7 @@
            console.log(row)
         },
         addToGB: function(row){
            this.$refs.addStreamTOGB.openDialog({app: row.app, stream: row.stream}, this.initData);
            this.$refs.addStreamTOGB.openDialog({app: row.app, stream: row.stream, mediaServerId: row.mediaServerId}, this.initData);
         },
         removeFromGB: function(row){
            var that = this;