From 1e01cb4da6055dd19c720a7012301ec34bee982a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 30 六月 2025 16:41:04 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

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

diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index f3070a7..4dedfc6 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -445,6 +445,7 @@
                 flagLogic: "铏氭嫙搴撲綅",
                 fucAtrrs: "鍔熻兘灞炴��",
                 barcode: "瀹瑰櫒鐮�",
+                startChannel: "璧峰宸烽亾",
                 unit: "鍗曚綅",
                 size: "闀�/瀹�/楂�",
                 length: "闀�",
@@ -882,6 +883,7 @@
                 orderCode: "婧愬崟鍙�",
                 orderItemId: "婧愬崟鏄庣粏ID",
                 unit: "鍗曚綅",
+                exceStatus: '鎵ц鐘舵��',
                 trackCode: "璺熻釜鐮�",
                 fieldsIndex: "鍔ㄦ�佹墿灞�",
                 anfme: "鏁伴噺",
@@ -1141,7 +1143,7 @@
         continue: '缁х画鏀惰揣',
         batch: '鎵归噺鎿嶄綔',
         confirm: '纭',
-        start: '寮�濮嬩笅鍙�',
+        start: '鑷姩涓嬪彂',
         pause: '鏆傚仠',
         pick: '鎷f枡',
         check: '鐩樼偣',
@@ -1175,6 +1177,7 @@
         orderPrint: '鎵撳嵃鍗曟嵁',
         createTask: "涓嬪彂浠诲姟",
         publicWorking: '涓嬪彂鎵ц',
+        continuePub: '缁х画涓嬪彂',
         createWave: "鐢熸垚娉㈡",
         recover: "缁х画鏀惰揣",
         modiftySite: '淇敼搴撳彛',

--
Gitblit v1.9.1