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

xuxueyang

2024-09-24 272188e47087a8ef92eb0a48b122fa1c73ea94d3

 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">