From 392d87eca7b990bad5e2db95da8b5c322357874b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 22 三月 2025 14:43:43 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

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

diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index f94b280..2f2f96b 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -13,8 +13,8 @@
             id: 'ID',
             uuid: '缂栧彿',
             name: '鍚嶇О',
-            createTime: '娣诲姞鏃堕棿',
-            createBy: '娣诲姞浜哄憳',
+            createTime: '鍒涘缓鏃堕棿',
+            createBy: '鍒涘缓浜哄憳',
             updateTime: '淇敼鏃堕棿',
             updateBy: '淇敼浜哄憳',
             status: '鐘舵��',
@@ -122,11 +122,11 @@
         userLogin: '鐧诲綍鏃ュ織',
         customer: '瀹㈡埛琛�',
         shipper: '璐т富淇℃伅',
-        matnr: '鐗╂枡鏁版嵁',
+        matnr: '鐗╂枡',
         matnrGroup: '鐗╂枡鍒嗙粍',
-        warehouse: '浠撳簱淇℃伅',
-        warehouseAreas: '浠撳簱搴撳尯',
-        loc: '鍩虹搴撲綅',
+        warehouse: '浠撳簱',
+        warehouseAreas: '搴撳尯',
+        loc: '搴撲綅',
         locType: '搴撲綅绫诲瀷',
         locArea: '閫昏緫鍒嗗尯',
         container: '瀹瑰櫒绠$悊',

--
Gitblit v1.9.1