From 1abae1d821d2c4da18a16145e3d9d8f7a747da02 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 08 九月 2023 17:11:37 +0800
Subject: [PATCH] Merge branch 'master' of ssh://10.153.19.150:29418/CanadaMes

---
 CanadaMes-ui/src/lang/locales/zh-CN.json |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index ee14dae..d1971e8 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -35,6 +35,7 @@
   "exit": "閫�鍑�",
   "changePassword": "淇敼瀵嗙爜",
   "resetPassword": "閲嶇疆瀵嗙爜",
+
   "home": "涓婚〉",
   "role": "瑙掕壊",
   "langRoleManagement": "瑙掕壊绠$悊",
@@ -164,10 +165,12 @@
     "B02 OUT DEC error": "B02 OUT DEC 閿欒",
     "B02 OUT pos error": "B02 OUT pos 閿欒"
   },
+  "Electrical": "璁惧绠$悊",
   "Parameter": "鍙傛暟涓嬪彂",
   "Action": "寮�鍏虫帶鍒�",
   "Sign": "IO鐘舵��",
   "State": "State",
   "Alarm": "鎶ヨ淇℃伅",
   "Distribute": "涓嬪彂"
-}
\ No newline at end of file
+}
+

--
Gitblit v1.8.0