Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-06 ae4f19ec2145369fb8e53722f0581c3bc05062a3

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

@@ -23,7 +23,9 @@
        <if test="condition.endDate != null">
            AND s.create_time &lt;= #{condition.endDate}
        </if>

        <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
    </select>