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

chenyabin

2021-04-14 ca6c15a55e1aca6afc26885366eb7b23249b6968

 src/components/table/components/tabHandover.vue

@@ -1,5 +1,5 @@
<template>
  <el-tabs  v-model="activeName" type="border-card">
  <el-tabs  v-model="activeName">
    <el-tab-pane label="废水" name="first">
      <waste-water></waste-water>
    </el-tab-pane>