jiangyc/ruoyi-plus-soybean
1
0
Fork 0
mirror of https://github.com/m-xlsea/ruoyi-plus-soybean.git synced 2025-09-24 07:49:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# 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
parent 52c08c1946 05dc11e258
commit 82b6ff6c92
70 changed files with 1652 additions and 2152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/router/elegant/routes.ts
View File

@ -131,18 +131,7 @@ export const generatedRoutes: GeneratedRoute[] = [
meta: {
title: 'system_config',
i18nKey: 'route.system_config'
},
children: [
{
name: 'system_config_notice',
path: '/system/config/notice',
component: 'view.system_config_notice',
meta: {
title: 'system_config_notice',
i18nKey: 'route.system_config_notice'
}
}
]
}
},
{
name: 'system_dept',