Merge remote-tracking branch 'soybeanjs/main' into ruoyi

# Conflicts:
#	CHANGELOG.md
#	README.md
#	build/config/proxy.ts
#	build/plugins/index.ts
#	package.json
#	src/plugins/loading.ts
#	src/service/request/index.ts
#	src/store/modules/auth/index.ts
#	src/store/modules/route/index.ts
#	src/typings/vite-env.d.ts
#	src/views/_builtin/login/modules/pwd-login.vue
This commit is contained in:
xlsea
2025-04-23 15:18:24 +08:00
70 changed files with 1652 additions and 2152 deletions

View File

@ -179,7 +179,9 @@ const local: App.I18n.Schema = {
system_post: '岗位管理',
monitor: '系统监控',
'monitor_login-infor': '登录日志',
'monitor_oper-log': '操作日志'
'monitor_oper-log': '操作日志',
system_client: '客户端管理',
system_notice: '通知公告'
},
page: {
login: {