From 5d726c33c3da931a7c5c43bba3f37a4e8c11ca93 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 18 九月 2023 21:11:21 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

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

diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index 4d83f47..5a565aa 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -279,5 +279,11 @@
   "alacontent": "鎶ヨ鍐呭",
   "time-on": "寮�濮嬫椂闂�",
   "End-Time": "缁撴潫鏃堕棿",
+<<<<<<< HEAD
   "ElectricalPassword":"鐢垫皵瀵嗙爜"
+=======
+  "Please enter the password":"璇疯緭鍏ュ瘑鐮�",
+  "Password error":"瀵嗙爜閿欒",
+  "DataBase Connection failed":"鏁版嵁搴撹繛鎺ュけ璐�"
+>>>>>>> 5aa99c119f387d6f32a58dfc7190351f6f92ecf6
 }
\ No newline at end of file

--
Gitblit v1.8.0