Merge remote-tracking branch 'origin/dev' into v2.0

Browse Source

# Conflicts:
#	src/service/request/index.ts
#	src/views/_builtin/login/index.vue
#	src/views/system/dept/modules/dept-operate-drawer.vue
#	src/views/system/menu/modules/menu-operate-drawer.vue
#	src/views/system/post/index.vue
#	src/views/system/user/index.vue
#	src/views/tool/gen/modules/gen-table-operate-drawer.vue

...

This commit is contained in:

xlsea

2025-09-16 15:32:18 +08:00

parent 9c51f75404 4e27f3b5a5

commit 3496852be1

20 changed files with 764 additions and 945 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

pnpm-lock.yaml

Generated

+667 -872

File diff suppressed because it is too large Load Diff