Merge remote-tracking branch 'origin/master'

wangqi

2021-03-15 811fc5e4e89c9a5222e895587bfa1c2e9fcc08f4

 src/App.vue

@@ -14,7 +14,6 @@
</script>

<style lang="less">
@import '@assets/css/map/_map-variable';
html, body, #app{
  color: @color;
  height: 100vh;