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

chenyabin

2021-04-15 8f327155ec6a3d5ad1f1ff4e170ed85747439373

 src/components/table/components/tabHandover.vue

@@ -24,7 +24,7 @@
<script>
import WasteWater from '@components/table/components/WasteWater'
// import WasteGas from '@components/table/components/WasteGas'
import SolidWaste from '@components/table/components/SolidWaste'
import SolidWaste from '@components/table/components/WasteSolid'
import AirQuality from '@components/table/components/AirQuality'

import { TopicList } from '../../../conf/Topic'