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

chenyabin

2021-04-15 8f327155ec6a3d5ad1f1ff4e170ed85747439373

 src/components/table/components/WasteSolid.vue

File was renamed from src/components/table/components/SolidWaste.vue
@@ -95,7 +95,7 @@
import MissingAlarm from '@components/table/components/componented/MissingAlarm'

export default {
  name: 'SolidWaste',
  name: 'WasteSolid',
  components: {
    MissingAlarm,
    Refinery,