From c6acf648b8bcee16df04dcc26e146c5d2dfb00b4 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 08 七月 2025 11:54:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcOverrunAlarmMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 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 9fdc3e5..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,13 +13,13 @@
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}
</if>
</where>
ORDER BY
- create_time DESC
+ t1.create_time DESC
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3