chore: 🔨 合并冲突解决
This commit is contained in:
1 parent
2dd4421fdf
commit
711e3ba5f4
48 files changed
+207
-791
No files matched your search
@@ -31,7 +31,7 @@
|
||||
v-hasPerm="['sys:dept:add']"
|
||||
type="success"
|
||||
icon="plus"
|
||||
@click="handleOpenDialog(0, undefined)"
|
||||
@click="handleOpenDialog()"
|
||||
>
|
||||
新增
|
||||
</el-button>
|
||||
|
||||
Reference in new issue
Block a user