From dd60bcc7b38c2a19c02a20550a393987fc5a5a27 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 07 八月 2024 16:26:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index d2c352b..ef28802 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -220,6 +220,8 @@
         basic:'璁惧',
         add:'纭淇濆瓨',
         cancel:'鍙栨秷',
+        temperingtotal:'閽㈠寲鐐夋暟锛�',
+        glasstotal:'鐜荤拑鎬绘暟锛�',
     },
     workOrder:{
         glassID:'鐜荤拑ID',
@@ -237,6 +239,7 @@
         takemessage:'鏄惁鎷胯蛋璇ユ潯淇℃伅锛�',
         breakage:'鐮存崯',
         takeout:'鎷胯蛋',
+        glasstype:'鐜荤拑绫诲瀷',
     },
     processCard:{
         intofurnace:'杩涚倝涓�',

--
Gitblit v1.8.0