解决冲突

doum

2026-03-06 34fe52caba63e6a6337cb9c3e6bd0d4707fd6a99

 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