From 63100c0391d3a4f1d41ac5e580625913b2edd265 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 04 十一月 2025 13:15:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index c8a4644..7a4d0e9 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -36,6 +36,7 @@
       basicData:{
           untask:'鏃犱换鍔�',
           tonumber:'涓婄墖鎬绘暟閲�',
+          sectionUpperSuccessful:'涓婄墖鎿嶄綔鎴愬姛锛�',
           finishnumber:'宸插畬鎴愭暟閲�',
           rackreset:'鏋跺瓙澶嶄綅',
           prackreset:'鏄惁鏋跺瓙澶嶄綅锛�',
@@ -469,6 +470,11 @@
           prompt:'鎻愮ず',
       },
       delivery:{
+          alarmStartTime:'鎶ヨ寮�濮嬫椂闂�',
+          alarmEndTime:'鎶ヨ缁撴潫鏃堕棿',
+          equipment:'璁惧',
+          content:'鍐呭',
+          confirmer:'纭浜�',
           addrole:'娣诲姞瑙掕壊',
           editrole:'淇敼瑙掕壊',
           role :'瑙掕壊',
@@ -815,6 +821,9 @@
         content:'鍐呭',
         idSame:'杩涚墖浠诲姟鐜荤拑ID鐩稿悓',
         sizeSame:'绗煎唴瀛樺湪鐩稿悓瑙勬牸鐨勭幓鐠�',
+        slotLess:'鍓╀綑鏍煎瓙涓嶈冻',
+        overSize:'鐩撮�氱墖鍙板瓨鍦ㄧ幓鐠冿紝缁撴潫鏈杩涚墖',
+        noGlass:'鏈壘鍒扮幓鐠冧俊鎭紝璇烽鍙栧伐绋�',
         projectMsg2:'璇烽�夋嫨鏍囩妯℃澘',
         clickmakesure: '鏄惁纭鐐瑰嚮锛�',
         logarithm: '瀵规暟锛�',

--
Gitblit v1.8.0