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

chenyabin

2021-05-14 f6e2c7d08bb4f29f38a77b9f789c6d7a47d5bebe

 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'
    }
  ]
}