From 0cb816f646b57c2eb7679bde53ce8eae4da16f85 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 17 二月 2025 13:26:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main' into dev

---
 rsf-admin/src/i18n/zh.js |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 57 insertions(+), 0 deletions(-)

diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index b6e7e5e..600b2a5 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -107,6 +107,8 @@
     menu: {
         dashboard: '鎺у埗鍙�',
         settings: '涓汉璁剧疆',
+        basicSettings: '鍩虹璁剧疆',
+        pakin: '缁勬墭',
         system: '绯荤粺璁剧疆',
         user: '鐢ㄦ埛绠＄悊',
         role: '瑙掕壊绠＄悊',
@@ -134,6 +136,8 @@
             },
             tenant: {
                 name: "绉熸埛鍚�",
+                flag: "浠ｇ爜",
+                root: "绠＄悊鍛�",
             },
             role: {
                 name: "瑙掕壊鍚嶇О",
@@ -219,6 +223,59 @@
         }
     },
     page: {
+        welcome: {
+            index: '  娆㈣繋浣跨敤RSF绠＄悊绯荤粺',
+            tech: '  鎶�鏈爤: Java17, SpringBoot2.5.3, Mybatis-plus_3.4.1, Spring Security, Druid 1.2.6, Redis, Mysql5.7, Node18, ReactJs, Material UI5.16, Axios, React-Admin5.1'
+        },
+        login: {
+            title: '娆㈣繋浣跨敤',
+            footer: 'Footer Goes Here',
+            tenant: '鍏徃',
+            email: '閭鍦板潃',
+            username: '鐧诲綍璐﹀彿',
+            password: '瀵嗙爜',
+            confirmPwd: '纭瀵嗙爜',
+            code: '楠岃瘉鐮�',
+            tab: {
+                login: '鐧诲綍',
+                register: '娉ㄥ唽',
+            },
+            button: {
+                login: '鐧诲綍',
+                register: '娉ㄥ唽',
+                code: '鑾峰彇楠岃瘉鐮�',
+            },
+        },
+        settings: {
+            resetPwd: {
+                currPwd: '褰撳墠瀵嗙爜',
+                newPwd: '鏂板瘑鐮�',
+                confirmNewPwd: '纭鏂板瘑鐮�',
+                resetBtn: '閲嶇疆瀵嗙爜',
+                tip: {
+                    usernameLimit: '浠呭厑璁歌緭鍏� 3-20 涓嫳鏂囧瓧姣嶆垨鏁板瓧锛屼笉鑳藉寘鍚壒娈婂瓧绗�',
+                    pwdInputLimit: "瀵嗙爜蹇呴』涓�6-13浣�,涓斿繀椤诲寘鍚瓧姣嶅拰鏁板瓧",
+                    pwdNotSameAsOld: "鏂板瘑鐮佷笉鑳戒笌褰撳墠瀵嗙爜鐩稿悓",
+                    pwdNotMatch: "纭瀵嗙爜涓嶄竴鑷�",
+                }
+            }
+        },
+        tenant: {
+            create: {
+                title: {
+                    basic: '鍩虹淇℃伅',
+                    root: '娣诲姞绠＄悊鍛�',
+                    confirm: '纭',
+                },
+                btn: {
+                    next: '涓嬩竴姝�',
+                    back: '涓婁竴姝�',
+                },
+                tip: {
+                    onlyEn: '浠呭厑璁歌緭鍏� 3-20 涓嫳鏂囧瓧姣�'
+                },
+            },
+        },
     }
 };
 

--
Gitblit v1.9.1