Merge branch 'dev' into v2.0

Browse Source

# Conflicts:
#	package.json
#	packages/scripts/package.json
#	pnpm-lock.yaml
#	src/views/system/user/modules/user-operate-drawer.vue

...

This commit is contained in:

xlsea

2025-09-01 15:18:26 +08:00

parent 2504498eb5 e230b0da81

commit 6dcc8c349a

10 changed files with 1128 additions and 636 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

+975 -600

File diff suppressed because it is too large Load Diff