Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-ui/src/lang/zh.js
This commit is contained in:
lsymicc
2025-06-11 17:47:39 +08:00
18 changed files with 280 additions and 11 deletions

View File

@@ -1,12 +1,14 @@
// en.js
export default {
login: {
title: 'RuoYi Login Form',
title: 'FORTUCKY WMS SYSTEM',
logIn: 'Login in',
username: 'Username',
password: 'Password',
code: 'Code',
rememberMe: 'Remember Me'
rememberMe: 'Remember Me',
bottom:'Copyright © 2025 ForTucky All Rights Reserved.400-1882-319'
},
tagsView: {
refresh: 'Refresh',
@@ -627,6 +629,7 @@ export default {
},
viewsMain: {
systemTitle: 'RuoYi Admin',
title: 'homePage',
unfinishedInboundTask: 'Unfinished Inbound Task Overview',
taskKey: 'Task Key',