Merge branch 'develop' of https://github.com/Frappet/bma-ehr-admin into develop

Browse source

# Conflicts:
#	src/modules/02_users/router.ts
#	src/modules/02_users/views/detailRoleView.vue
#	src/modules/02_users/views/permissionDetail.vue
#	src/modules/02_users/views/roleDetail.vue

...

This commit is contained in:

DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-05-31 16:44:29 +07:00

parent e8d0e3de81 fc575094ee

commit 581cd7a7de

3 changed files with 1427 additions and 106 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1262

src/modules/02_users/views/permissionDetail.vue Normal file

View file

File diff suppressed because it is too large Load diff