Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client

# Conflicts:
#	frontend/src/api/system/dictData.ts
#	frontend/src/views/authority/role/components/rolePopup.vue

frontend/src/views/authority/role/index.vue

@@ -191,7 +191,7 @@ const openDrawer = (title: string, row: Partial<Role.RoleBO> = {}) => {
       openType = 'add'
     else if (title === '编辑角色')
       openType = 'edit'
-
+   
     rolePopupVisible.value = true
     rolePopupTitle.value = title
 
@@ -204,6 +204,7 @@ const openDrawer = (title: string, row: Partial<Role.RoleBO> = {}) => {
     }
 
     rolePopupData.value = safeRow
+    
   } else if (title === '设置权限') {
     permissionUnitVisible.value = true
     permissionUnitTitle.value = title