chore: 🔨 合并冲突解决

2024-11-16 23:00:30 +08:00
parent 2dd4421fdf
commit 711e3ba5f4
48 changed files with 207 additions and 791 deletions
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -31,7 +31,7 @@
          v-hasPerm="['sys:dept:add']"
          type="success"
          icon="plus"
-          @click="handleOpenDialog(0, undefined)"
+          @click="handleOpenDialog()"
        >
          新增
        </el-button>