From 96a33df75fe629083dc44d51f46df1f31ffac8d7 Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期二, 01 七月 2025 20:06:14 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverrunAlarmMapper.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverrunAlarmMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverrunAlarmMapper.xml index 8504aca..f812bb9 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverrunAlarmMapper.xml +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverrunAlarmMapper.xml @@ -13,7 +13,7 @@ AND t1.equipment_id LIKE CONCAT(CONCAT('%',#{mdcEquipment.equipmentId}),'%') </if> <if test="mdcEquipment.equipmentType != null and mdcEquipment.equipmentType != '' "> - AND t2.equipmentType = #{mdcEquipment.equipmentType} + AND t2.equipment_type = #{mdcEquipment.equipmentType} </if> <if test="mdcEquipment.driveType != null and mdcEquipment.driveType != '' "> AND t2.drive_type = #{mdcEquipment.driveType} -- Gitblit v1.9.3