From f3c0b41a36c719d3874de916b9c8178bb669a140 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 16 十二月 2024 16:55:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/zh.js | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 610d185..89cb7d2 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -239,7 +239,6 @@
team:'鐝粍',
basic:'璁惧',
makesure:'纭淇濆瓨',
- cancel:'鍙栨秷',
temperingtotal:'閽㈠寲鐐夋暟锛�',
glasstotal:'鐜荤拑鎬绘暟锛�',
Labelprinting:'鏍囩鎵撳嵃',
@@ -340,7 +339,6 @@
width:'瀹藉害',
height:'楂樺害',
},
-
productStock:{
addusers:'娣诲姞鐢ㄦ埛',
username:'鐢ㄦ埛鍚�',
@@ -411,14 +409,11 @@
},
replenish:{
patchManagement:'琛ョ墖绠＄悊',
-
},
rework:{
reworkManagement:'杩斿伐绠＄悊',
addRework:"杩斿伐鏂板 ",
},
-
-
role:{
id:'ID',
characterHomepage:'瑙掕壊棣栭〉',
@@ -512,9 +507,9 @@
productiontime :'鐢熶骇鏃堕棿',
starttime :'寮�濮嬫椂闂�',
endtime :'缁撴潫鏃堕棿',
- ctype :'娓呴�夋嫨绫诲瀷',
- cstate :'娓呴�夋嫨鐘舵��',
- cprocess :'娓呴�夋嫨宸ュ簭',
+ ctype :'璇烽�夋嫨绫诲瀷',
+ cstate :'璇烽�夋嫨鐘舵��',
+ cprocess :'璇烽�夋嫨宸ュ簭',
all :'鍏ㄩ儴',
completed :'瀹屽伐',
broke :'鐮存崯',
--
Gitblit v1.8.0