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

chenzeping

2021-03-15 0415f4c1c98109117873bcd82cf2f1216afc0fb9

 src/components/table/components/WasteGas.vue

@@ -98,6 +98,7 @@
</template>

<script>

export default {
  name: 'WasteGas',
  data () {