From fb86bd1a73bb18ba1e947b76382283d27e3d5e95 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 27 十二月 2024 00:00:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UI-Project/src/lang/zh.js |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index a9e67c8..237d7f1 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -87,6 +87,22 @@
           layoutSequence:'搴忓彿',
       },
       sorter:{
+          onesort:'涓�绾挎幇鐗�',
+          twosort:'浜岀嚎鎺扮墖',
+          inPlace:'鍒颁綅',
+          ninPlace:'鏈埌浣�',
+          emptymissions:'绌轰换鍔�',
+          advancetask:'杩涚墖浠诲姟',
+          outputtasks:'鍑虹墖浠诲姟',
+          straighttasks:'鐩撮�氫换鍔�',
+          endingtask:'缁撴潫',
+          another:'鍏朵粬',
+          id:'纾ㄨ竟鍓嶇悊鐗囩琛↖D',
+          remainWidth:'鍓╀綑',
+          taskRunning:'浠诲姟璇锋眰',
+          updateTime:'鏇存柊鏃堕棿',
+          place:'鏄惁鍒颁綅',
+          layernow:'褰撳墠灞傚彿',
           gridnumber:'鏍呮牸鍙�',
           glassnumber:'鐜荤拑缂栧彿',
           width:'瀹�',
@@ -107,9 +123,18 @@
           projectnumber:'璇疯緭鍏ュ伐绋嬪彿',
           dilapidation:'鐮存崯',
           takeaway:'浜哄伐鎷胯蛋',
+          takeawaya:'鏄惁浜哄伐鎷胯蛋璇ユ潯淇℃伅锛�',
           takeon:'鎽嗙墖瀹屾垚',
       },
       searchOrder:{
+          empty:'榛樿绌轰换鍔�',
+          historicaltasks:'鍘嗗彶浠诲姟',
+          cagedetails:'绗煎唴璇︽儏',
+          inkageEntity:'杩涚墖鑱旀満鐘舵�侊細',
+          requestEntity:'杩涚墖璇锋眰鐘舵�侊細',
+          mesReplyEntity:'鍚姩鍛戒护锛�',
+          outInkageEntity:'鍑虹墖鑱旀満鐘舵�侊細',
+          outRequestEntity:'鍑虹墖璇锋眰鐘舵�侊細',
           breakagn:'鏈牬鎹�',
           lacknumber:'缂虹墖鏁伴噺',
           processcard:'鎸囧畾娴佺▼鍗�',

--
Gitblit v1.8.0