解决冲突

doum

2026-03-06 34fe52caba63e6a6337cb9c3e6bd0d4707fd6a99

 admin/src/views/system/dict.vue

@@ -20,6 +20,7 @@
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['system:dict:delete']">删除</el-button></li>
      </ul>
      <el-table
          :height="tableHeightNew"
        v-loading="isWorking.search"
        :data="tableData.list"
        :default-sort = "{prop: 'createTime', order: 'descending'}"