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

chenzeping

2021-03-15 8b379507d2475cbe49abc3bc0564eccb81aeb384

 src/components/table/components/WasteGas.vue

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

<script>

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