From 07fa8e744d9ed8dce280a4ca6851fe50d27ff4bd Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 13 八月 2024 14:11:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

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

--
Gitblit v1.8.0