From dd4778d2cc47467a39473f02513ec5438b5c9512 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 05 九月 2025 12:31:58 +0800
Subject: [PATCH] 1、合并冲突
---
UI-Project/src/lang/en.js | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index f0eb1b8..81fb0dd 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -129,12 +129,16 @@
},
order: {
projectnumber: 'Please enter the project number',
+ noGlassToDamage:'No broken glass锛�',
dilapidation: 'Breakage',
+ dilapidationWhether:'Whether it is broken with one click锛�',
takeaway: 'Manual removal',
takeawaya: 'Should the information be manually taken away锛�',
takeon: 'The arrangement is complete',
},
searchOrder: {
+ firstLinePriority: 'First-line priority',
+ secondLinePriority: 'second-line priority',
hollowPriority:'Hollow priority',
furnaces:'Number of full furnaces',
furnfullTemp: 'Total amount of glass',
--
Gitblit v1.8.0