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

xiaoxie

2021-12-01 6ac131bcf6ec034ffc9e5813c68c56c6e5c32b70

 web_src/src/components/MediaServerManger.vue

@@ -127,7 +127,6 @@
          }
        }

        console.log("aadada:    "+ resultVal)
        return resultVal;
      },
         dateFormat: function(/** timestamp=0 **/) {