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

whycq

2023-08-28 d3f11759e6b32d7e9e63e0f7b0cc4b6874aea020

 src/main/resources/mapper/OrderMapper.xml

@@ -62,4 +62,12 @@
        order by create_time asc
    </select>

    <select id="selectToBeHistoryOrder" resultMap="BaseResultMap">
        select *
        from man_order
        where 1=1
        and settle = 4
        order by create_time asc
    </select>

</mapper>