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

chenyabin

2021-04-07 8bb474b9fcf3f964d7937bcb2c3e7bb2d139bf7c

 src/conf/layers/LayerWasteSolid.js

File was renamed from src/conf/layers/LayerSolidWaste.js
@@ -3,7 +3,7 @@
 * @type {string}
 */

export const LayerSolidWaste = {
export const LayerWasteSolid = {
  code: 'solidWaste',
  name: '固废',
  checked: true,