Merge remote-tracking branch 'origin/master-v2' into master-v2

gongzuming

2024-09-26 e468d0b56e1c33f047bee84ca8c9a142c769fe16

 src/main/resources/mapper/payment/OrderSettlementMapper.xml

@@ -26,7 +26,7 @@
        <if test="condition.userName != null and condition.userName != ''">
            AND (si.name LIKE CONCAT('%', #{condition.userName}, '%') OR pi.name LIKE CONCAT('%', #{condition.userName}, '%'))
        </if>
        ORDER BY s.create_time desc
        ORDER BY s.create_time desc, userName
    </select>

    <select id="getUserIncome" resultType="java.math.BigDecimal">