opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-19 01:48:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.X' into 5.X

Browse Source
This commit is contained in:
sunyuehai 2024-08-25 00:33:50 +08:00
commit 43018e65dc
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java
View File

@ -197,6 +197,7 @@ public class EqDeviceController extends BaseController {
if (CollectionUtils.isEmpty(eqEquipmentVos)) return; if (CollectionUtils.isEmpty(eqEquipmentVos)) return;
EqEquipmentVo eqEquipmentVo = eqEquipmentVos.get(0); EqEquipmentVo eqEquipmentVo = eqEquipmentVos.get(0);
//日志数据组装 //日志数据组装
eqEquipmentLogBo.setEquipmentId(eqEquipmentVo.getEquipmentId());
eqEquipmentLogBo.setEquipmentCode(equipmentCode); eqEquipmentLogBo.setEquipmentCode(equipmentCode);
eqEquipmentLogBo.setEquipmentName(equipmentName); eqEquipmentLogBo.setEquipmentName(equipmentName);
eqEquipmentLogBo.setUserId(eqEquipmentVo.getUserId()); eqEquipmentLogBo.setUserId(eqEquipmentVo.getUserId());

2
ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties
View File

@ -98,6 +98,8 @@ logStatus.name111=忘记关门提醒
logStatus.name112=门体手动开启提醒 logStatus.name112=门体手动开启提醒
logStatus.name113=半开门运行提醒 logStatus.name113=半开门运行提醒
logStatus.name114=门体停止运行提醒 logStatus.name114=门体停止运行提醒
logStatus.name500=离线
logStatus.name501=在线
message.fault.device.notfound = 设备不存在 message.fault.device.notfound = 设备不存在
message.fault.device.isbind = 设备已绑定 message.fault.device.isbind = 设备已绑定