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

chenyabin

2021-04-19 b765df07d1b732dad563712a49d0c0d810d940c9

 src/components/LayerController/LayerController.vue

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