Merge remote-tracking branch 'origin/dev_New' into dev_New

gongchunyi

2 天以前 f81364e8bfbede8de723c708eee8060cb2c63b83

 src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java

@@ -84,7 +84,7 @@
     * @param receiptPaymentDto
     * @return
     */
    List<CustomerInteractionDto> customerInteractions (ReceiptPaymentDto receiptPaymentDto);
    List<InvoiceLedgerDto> customerInteractions (InvoiceLedgerDto receiptPaymentDto);

    /**
     * 查询回款记录分页