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

648540858

2021-10-15 a371015be7c75357f6ce667918f2ec889ffb4c06

 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;
      })
    },