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/py.js | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/UI-Project/src/lang/py.js b/UI-Project/src/lang/py.js
index 2416d17..2afb031 100644
--- a/UI-Project/src/lang/py.js
+++ b/UI-Project/src/lang/py.js
@@ -129,11 +129,15 @@
order: {
projectnumber:'璇疯緭鍏ュ伐绋嬪彿',
takeon:'鎽嗙墖瀹屾垚',
+ noGlassToDamage:'袧懈泻邪泻芯谐芯 斜懈褌芯谐芯 褋褌械泻谢邪锛�',
dilapidation: '袩芯胁褉械卸写械薪懈械',
+ dilapidationWhether:'小谢芯屑邪械褌褋褟 谢懈 芯薪 芯写薪懈屑 泻谢懈泻芯屑锛�',
takeawaya:'鏄惁浜哄伐鎷胯蛋璇ユ潯淇℃伅锛�',
takeaway: '袙蟹褟褌褜 胁褉褍褔薪褍褞',
},
searchOrder: {
+ firstLinePriority: '袩褉懈芯褉懈褌械褌 锌械褉胁芯泄 谢懈薪懈懈',
+ secondLinePriority: '袩褉懈芯褉懈褌械褌 胁褌芯褉芯泄 谢懈薪懈懈',
hollowPriority:'涓┖浼樺厛绾�',
furnaces:'婊＄倝鐐夋暟',
furnfullTemp:'鐜荤拑鎬婚噺',
--
Gitblit v1.8.0