Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev

2025-11-06 16:50:09 +08:00
parent b82397fa5d 1e09fa4642
commit 44675a847c
190 changed files with 2823 additions and 2247 deletions
--- a/packages/locales/src/langs/en-US/ui.json
+++ b/packages/locales/src/langs/en-US/ui.json
@@ -119,6 +119,10 @@
      "errorPasswordTip": "Password error, please re-enter",
      "backToLogin": "Back to login",
      "entry": "Enter the system"
+    },
+    "timezone": {
+      "setTimezone": "Set Timezone",
+      "setSuccess": "Timezone set successfully"
    }
  },
  "upload": {
--- a/packages/locales/src/langs/zh-CN/ui.json
+++ b/packages/locales/src/langs/zh-CN/ui.json
@@ -119,6 +119,10 @@
      "errorPasswordTip": "密码错误，请重新输入",
      "backToLogin": "返回登录",
      "entry": "进入系统"
+    },
+    "timezone": {
+      "setTimezone": "设置时区",
+      "setSuccess": "时区设置成功"
    }
  },
  "upload": {