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

yangdelong

2021-05-29 71c663091d05b11c41f78d8e75cb8b3db63b9cbc

 src/components/LayerController/logic/WasteGas.js

@@ -12,8 +12,8 @@
// const ImagBright = '/assets/images/map/exhaust/fq_bright_green.png'

const mapApi = require('../../../api/mapApi').default
// const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
const WasteGasIndex = require('../../BaseNav/WasteGas/WasteGasIndex').default
// const publicBounced = require('../../base-page/PublicBounced/PublicBounced').default
const WasteGasIndex = require('../../base-page/WasteGas/WasteGasIndex').default
// const WasteGasChats = require('./WasteGasChats').default
module.exports = function () {
  /**