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

panlinlin

2021-02-25 0f58218badea86a5209ae7f1ccd60b7cb4b26eee

 web_src/src/components/ParentPlatformList.vue

@@ -137,7 +137,7 @@
            });
    },
    chooseChannel: function(platform) {
       this.$refs.chooseChannelDialog.openDialog(platform.deviceGBId, ()=>{
       this.$refs.chooseChannelDialog.openDialog(platform.serverGBId, ()=>{
         this.initData()
       })
    },