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

wangqi

2021-03-30 9f77315b5327bb5f32eacb31a69c9601a30e3800

 src/conf/layers/LayerSolidWaste.js

@@ -4,7 +4,7 @@
 */
export const LayerSolidWaste = {
  code: 'solidWaste',
  name: '废气',
  name: '固废',
  checked: true,
  layers: [
    {