微调

2024-11-11 15:40:49 +08:00
parent f05369556c
commit 0797ea046f
13 changed files with 97 additions and 70 deletions
--- a/frontend/src/views/authority/role/components/permissionUnit.vue
+++ b/frontend/src/views/authority/role/components/permissionUnit.vue
@@ -21,13 +21,7 @@
  const {dialogVisible,data} = defineProps<{
  dialogVisible: boolean;
  title: string;
-<<<<<<< HEAD
  data: Role.Permission;
-=======
-  data: Role.ResRoleLimport { Role } from '@/api/role/interface'
-  import { dialogBig } from '@/utils/elementBind'
-  ist;
->>>>>>> 74c03a2358e19cae853711ea22910b1697a4a903
 }>()

  // const leftvalue = ref<Role.Permission[]>([])