From 86903050702bb898277ed8f87202c0224867c47f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 14 三月 2025 16:18:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index 3fc49cc..8756cce 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -561,6 +561,13 @@
           starttime :'Start Time',
           endtime :'End Time',
           loading :'In the process of uploading锛�',
+          brokenNum:'brokenNum',
+          inventory:'inventory',
+          inventoryarea:'inventoryarea',
+          shippedQuantity:'shippedQuantity',
+          reportWorkQuantity:'reportWorkQuantity',
+          reportWorkQuantityCount:'reporting_work_num_count',
+          processId:'processId',
       },
       reportmanage:{
           productiontime :'production time',
@@ -710,6 +717,12 @@
           finegrinding: '绮剧(',
       },
       hellow: {
+          totalLayer: '鎬诲眰鏁�',
+          totalPairQuantity: '鎬婚厤瀵规暟閲�',
+          pairQuantity: '宸插畬鎴愰厤瀵规暟閲�',
+          isForceList: '鏄惁寮哄埗',
+          yesisForceList: '寮哄埗',
+          noisForceList: '闈炲己鍒�',
           hollowCountOutOne: '涓┖涓�绾跨幓鐠冩暟閲�',
           hollowCountOutTwo: '涓┖浜岀嚎鐜荤拑鏁伴噺',
           hollowTotalAreaOutOne: '涓┖涓�绾跨幓鐠冮潰绉�',

--
Gitblit v1.8.0