From 5ca031f91c59152392ee69974f2d986cd1e88fdb Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 17 二月 2025 14:07:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
rsf-admin/src/i18n/en.js | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index f6d8b77..4288984 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -107,6 +107,8 @@
menu: {
dashboard: 'Dashboard',
settings: 'Settings',
+ pakin: 'Pakin',
+ basicSettings: 'Basic Setting',
system: 'System',
user: 'User',
role: 'Role',
@@ -118,6 +120,9 @@
config: 'Config',
tenant: 'Tenant',
userLogin: 'Token',
+ customer: 'Customer',
+ shipper: 'shipper',
+ matnr: 'Matnr',
},
table: {
field: {
@@ -218,17 +223,55 @@
result: "result",
userId: "user",
},
+ customer: {
+ uuid: "uuid",
+ name: "name",
+ },
+ shipper: {
+ uuid: "uuid",
+ name: "name",
+ },
+ matnr: {
+ uuid: "uuid",
+ shipperId: "shipperId",
+ name: "name",
+ code: "code",
+ groupId: "groupId",
+ erpCode: "erpCode",
+ spec: "spec",
+ model: "model",
+ weight: "weight",
+ color: "color",
+ size: "size",
+ desc: "desc",
+ nromNum: "nromNum",
+ unit: "unit",
+ purchaseUnit: "purchaseUnit",
+ stockUnit: "stockUnit",
+ stockLeval: "stockLeval",
+ isLabelMange: "isLabelMange",
+ },
+ matnrGroup: {
+ name: "name",
+ code: "code",
+ parentId: "parentId",
+ },
}
},
page: {
- welcome: ' Welcome to the RSF Management System.',
+ welcome: {
+ index: ' Welcome to the RSF Management System.',
+ tech: ' Technology stack: Java 17, 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: 'Welcome',
footer: 'Footer Goes Here',
tenant: 'Company',
+ email: 'Email Address',
username: 'Username',
password: 'Password',
confirmPwd: 'Confirm Password',
+ code: 'Verification Code',
tab: {
login: 'SIGN IN',
register: 'SIGN UP',
@@ -236,6 +279,7 @@
button: {
login: 'SIGN IN',
register: 'SIGN UP',
+ code: 'Send Code',
},
},
settings: {
--
Gitblit v1.9.1