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

doum

20 小时以前 6cf36f0e43c9add691b9a375526ce7dc26209574

 admin/src/views/platform/water.vue

@@ -27,6 +27,7 @@
        <el-button type="primary" :loading="isWorking.export" v-permissions="['business:notice:exportExcel']" @click="exportExcel">导出</el-button>
      </ul>
      <el-table
          :height="tableHeightNew"
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe