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 |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 9490a9c..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: '瑙掕壊绠$悊',
@@ -135,6 +137,7 @@
             tenant: {
                 name: "绉熸埛鍚�",
                 flag: "浠g爜",
+                root: "绠$悊鍛�",
             },
             role: {
                 name: "瑙掕壊鍚嶇О",
@@ -220,14 +223,19 @@
         }
     },
     page: {
-        welcome: '  娆㈣繋浣跨敤RSF绠$悊绯荤粺',
+        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: '鍏徃',
-            username: '璐﹀彿',
+            email: '閭鍦板潃',
+            username: '鐧诲綍璐﹀彿',
             password: '瀵嗙爜',
             confirmPwd: '纭瀵嗙爜',
+            code: '楠岃瘉鐮�',
             tab: {
                 login: '鐧诲綍',
                 register: '娉ㄥ唽',
@@ -235,6 +243,7 @@
             button: {
                 login: '鐧诲綍',
                 register: '娉ㄥ唽',
+                code: '鑾峰彇楠岃瘉鐮�',
             },
         },
         settings: {

--
Gitblit v1.9.1