Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

wuyouming666

2023-09-18 5d726c33c3da931a7c5c43bba3f37a4e8c11ca93

 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

}