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

陶杰

2024-09-19 263a13a155ec759b1cb26cc00edd640f4d2e747c

 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>