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

648540858

2021-11-22 3e76214d0768abe027e10d983015cfb4d820a6d9

 web_src/src/components/dialog/deviceEdit.vue

@@ -82,7 +82,7 @@
    },
    getMediaServerList: function (){
      let that = this;
      that.mediaServerObj.getMediaServerList((data)=>{
      that.mediaServerObj.getOnlineMediaServerList((data)=>{
        that.mediaServerList = data.data;
      })
    },