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

XingChuan

2021-05-30 2d5e75bbc04d8c4c5c7dc6bb141ad16ffa2d9936

 src/conf/layers/LayerWasteSolid.js

@@ -15,7 +15,8 @@
      sname: '贮存点',
      checked: false,
      type: 0,
      url: 'http://www.baidu2.com'
      url: 'http://www.baidu2.com',
      legendImage: '../.././assets/images/map/solidwaste/gf_green.png'
    }
  ]
}