Merge remote-tracking branch 'origin/dev' into dev

zhanghl

2025-05-23 97ee5904ad00373cd60e1e12d26bad6b5cdb6b66

 aps-modules/aps-core/src/main/resources/mapper/core/ApsPlanTaskMapper.xml

@@ -21,6 +21,8 @@
        update_by,update_time,del_flag
    </sql>
    <select id="pagingList" resultMap="BaseResultMap">
        select * from  aps_plan_task
        select apt.id, apt.batch_num, apt.task_type, apt.task_status, apt.create_by, apt.create_time, apt.update_time
        from aps_plan_task as apt
        where apt.del_flag=0
    </select>
</mapper>