Merge remote-tracking branch 'origin/master'

aijinhui

2024-01-14 8a4810082529e48259ec332e034c05f1eea2399b

 ruoyi-admin/src/main/resources/i18n/messages_en_US.properties

@@ -182,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