Merge remote-tracking branch 'origin/master'

xuhy

2025-10-30 04ee19ddcf627d94a3e1034a445a2dc360354a1a

Merge remote-tracking branch 'origin/master'

 ruoyi-system/src/main/resources/mapper/system/TErpMaintenanceReminderMapper.xml

@@ -59,6 +59,7 @@
        <if test="query.status != null ">
            and t1.`status` = #{query.status}
        </if>
        order by t1.status asc
    </select>
    <select id="pageList1" resultType="com.ruoyi.system.vo.TErpMaintenanceReminderListVo">
        select t1.id,
@@ -95,6 +96,7 @@
        <if test="query.status != null ">
            and t1.`status` = #{query.status}
        </if>
        order by t1.status asc
    </select>

</mapper>