From 8dfdd82adc2250be4c4d7b7f79b2b6e4e47e728d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 25 三月 2025 13:52:48 +0800
Subject: [PATCH] Merge branch 'front' into devlop

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

diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index f6dd347..a1976a7 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -286,6 +286,7 @@
                 name: "鍚嶇О",
                 code: "缂栫爜",
                 parentId: "涓婄骇鏍囪瘑",
+                parCode: "涓婄骇缂栫爜",
             },
             warehouse: {
                 name: "浠撳簱鍚嶇О",
@@ -329,8 +330,8 @@
                 splrBtch: "渚涘簲鍟嗘壒娆�",
             },
             loc: {
-                warehouseId: "浠撳簱",
-                areaId: "搴撳尯",
+                warehouseId: "鎵�灞炰粨搴�",
+                areaId: "鎵�灞炲簱鍖�",
                 code: "缂栫爜",
                 type: "搴撲綅绫诲瀷",
                 name: "鍚嶇О",
@@ -646,6 +647,7 @@
         subzone: '缁戝畾鍒嗗尯',
         bindmatnr: '缁戝畾鐗╂枡',
         bindloc: '缁戝畾搴撲綅',
+        batchMatnrGropu: '鎵归噺鐗╂枡鍒嗙粍',
     },
 };
 

--
Gitblit v1.9.1