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

yangdelong

2021-05-30 4adfa4774e09f3b388335bb8dee5dea518856e5b

 src/conf/layers/LayerWasteSolid.js

@@ -7,13 +7,16 @@
  code: 'wasteSolid',
  name: '固废',
  checked: false,
  type: 0,
  layers: [
    {
      code: 'wasteSolidCcd',
      name: '贮存点',
      sname: '贮存点',
      checked: false,
      url: 'http://www.baidu2.com'
      type: 0,
      url: 'http://www.baidu2.com',
      legendImage: '../.././assets/images/map/solidwaste/gf_green.png'
    }
  ]
}