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

chenyabin

2021-05-18 7f6291e80073c0c29f9d24bfdd3ac2602a059e70

 src/conf/layers/LayerWasteGas.js

@@ -38,7 +38,8 @@
      sname: 'VOCs',
      checked: false,
      type: 0,
      url: ''
      url: '',
      legendImage: '../.././assets/images/map/solidwaste/voc.png'
    }
  ]
}