Merge remote-tracking branch 'origin/develop' into develop

ChenZeping

2021-05-08 4879421ff17a679a838de208125617d2eaa351a2

 src/components/LayerController/LayerController.vue

@@ -283,7 +283,7 @@
    color:@color;
  }
  .legend-content{
    width: 1.79167rem;
    //width: 1.79167rem;
  }
}