From b802e81da449baa2cb4ec23deb02055d3a8f8f5c Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 02 四月 2024 14:11:23 +0800
Subject: [PATCH] 修复相机密码脱敏导致的bug

---
 ruoyi-admin/src/main/resources/i18n/messages_en_US.properties |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties b/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
index c7a163f..02d6013 100644
--- a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
+++ b/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
@@ -15,7 +15,7 @@
 
 user.username.not.valid=*Composed of 2 to 20 Chinese characters, letters, numbers, or underscores, and must start with a non numeric character
 user.password.not.valid=*5-50 characters
- 
+
 user.email.not.valid=Email format error
 user.mobile.phone.number.not.valid=Mobile number format error
 user.login.success=Login successful
@@ -74,7 +74,11 @@
 menu.elecFence=elecFence
 menu.tube=tube
 menu.policeStation=policeStation
-menu.peopleAndCar=peopleAndCar
+menu.peopleAndCar=Personnel and vehicle management
+menu.userAndSanyi=Trinity account connection
+menu.sanyiCar=Vehicle coupling
+menu.sanYi=sanyi
+menu.rtuManage=rtuManage
 menu.inspect=inspect
 menu.inspectTask=inspectTask
 menu.inspectRecord=inspectRecord
@@ -98,8 +102,8 @@
 menu.accountUnlock=accountUnlock
 menu.batchForceOut=batchForceOut
 menu.singleForceOut=singleForceOut
-menu.codePreview=preview
-menu.codeGen=generator
+menu.preview=preview
+menu.generator=generator
 menu.query=query
 menu.add=add
 menu.edit=edit
@@ -107,6 +111,11 @@
 menu.export=export
 menu.import=import
 
+menu.plan=emergency
+menu.eplan=Emergency response drill
+menu.introduction=introduction
+menu.oilTankerManage=oilTankerManage
+menu.oilTankerFence=oilTankerFence
 
 ##\u5B57\u5178\u7C7B\u578B
 dic.type.sys.user.sex=userSex
@@ -163,6 +172,7 @@
 dic.data.sys.oper.type.force.out=forceLogout
 dic.data.sys.oper.type.gen=genCode
 dic.data.sys.oper.type.clear=clear
+dic.data.sys.oper.type.control=control
 dic.data.sys.common.status.success=success
 dic.data.sys.common.status.fail=fail
 dic.data.camera.type.samll.camera=samll
@@ -172,6 +182,7 @@
 dic.data.well.type.ketou=ketou
 dic.data.work.state.normal=normal
 dic.data.work.state.exception=exception
+dic.data.alarm.type.ai=AIAlarm
 dic.data.equip.type.alarm=alarmHost
 dic.data.equip.type.GPS=GPS
 dic.data.equip.type.gycgq=gycgq
@@ -199,8 +210,7 @@
 dic.data.cameras.priority.sys.radar.move=sys_radar_move
 dic.data.cameras.priority.sys.radar.fire=sys_radar_fire
 dic.data.cameras.priority.sys.radar.force=sys_radar_force
-dic.data.cameras.priority.sys.manual.inspection=sys_manual_inspection
-dic.data.cameras.priority.sys.auto.inspection=sys_auto_inspection
+dic.data.cameras.priority.sys.patrol.inspection=sys_patrol_inspect
 
 dic.data.inspect.mode.auto=auto
 dic.data.inspect.mode.manual=manual

--
Gitblit v1.9.3