From 1c26bd4ac7453b5f4a29f0e428893b5247a8fde8 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 24 十月 2023 10:18:57 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 CanadaMes-ui/src/lang/locales/zh-CN.json |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index 9ae6fe4..20c1032 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -235,7 +235,7 @@
   "width":"瀹�",
   "Operate":"鎿嶄綔",
   "end task":"瀹屾垚浠诲姟",
-  "cancal":"鍙栨秷",
+  "cancel":"鍙栨秷",
   "confirm":"纭",
   "number":"鏁伴噺",
   "Outfeed Barcodid":"鍑虹墖鐜荤拑id",
@@ -292,6 +292,9 @@
   "Usage":"浣跨敤鐜�",
   "Space (Pieces)":"绌洪棿(鐗囨暟)",
   "This glass is already in the cage":"绗煎瓙閲屽凡鏈夋鐜荤拑",
+  "Enter the Order lD":"璇疯緭鍏ヨ鍗昳d",
+  "OrderInfo":"璁㈠崟淇℃伅",
+  "Query":"鏌ヨ",
   "permission update":"鏉冮檺缂栬緫"
 
 }
\ No newline at end of file

--
Gitblit v1.8.0