Merge remote-tracking branch 'origin/master'

liding

2025-05-19 e8304b5b39787b25eb024fafd00d7db512ee6438

 src/main/resources/mapper/sales/ReceiptPaymentMapper.xml

@@ -33,7 +33,11 @@
                OR T1.sales_contract_no LIKE CONCAT('%',#{receiptPaymentDto.searchText},'%')
                )
            </if>
            <if test="receiptPaymentDto.customerId != null">
                AND T1.customer_id = #{receiptPaymentDto.customerId}
            </if>
        </where>
        ORDER BY  T1.receipt_payment_date ASC
    </select>

    <select id="receiptPaymentInfo" resultType="com.ruoyi.sales.dto.ReceiptPaymentDto">