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

chenyabin

2021-03-31 97e8d550c9867f7a92c56060835db2969e6fca2e

 src/conf/layers/LayerSolidWaste.js

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