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

panlinlin

2021-01-11 d94135c9cd8b12fc511055af4398ad3a584a44d6

 web_src/src/components/platformEdit.vue

@@ -250,7 +250,7 @@
</script>

<style>
.control-wrapper {
.control-wrapper-not-used {
  position: relative;
  width: 6.25rem;
  height: 6.25rem;