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

chenyabin

2021-04-15 93850b9aee34d3a66c2770a1eb0435ce104e772f

 src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue

@@ -6,7 +6,7 @@
<!--      </el-table-column>-->
<!--    </el-table-column>-->
<!--  </el-table>-->
  <div style="width: 755px">
  <div style="width: 5.9rem">
  <el-table
      :data="tableData"
      max-height="255px"
@@ -305,4 +305,7 @@
</script>

<style scoped>
.el-table--border::after, .el-table--group::after, .el-table::before{
  background: none;
}
</style>