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

徐旺旺

2021-04-20 c4acc9cdfc3a3a22bd89661a4af1429e01e2e260

 src/components/LayerController/modules/LcServiceLayer.vue

@@ -95,7 +95,8 @@

            .wms-panel-scrollbar{
                height: 457px;
                width: 2.5rem;
                width: 285px;
                //width: 2.5rem;
                font-size: 14px;
            }
            .layerbox {