Merge remote-tracking branch 'origin/master'

zhangherong

2025-07-18 6722e123b7a54dcc6c6937bc4324c67293f233db

 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}