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

maven

9 天以前 1f1ef0f62c4953e3ff9c610cda8f3c4f8a45c025

 src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java

@@ -26,7 +26,7 @@
     * @param receiptPaymentDto
     * @return
     */
    IPage<ReceiptPaymentDto> bindInvoiceNoRegPage(Page page, @Param("c") ReceiptPaymentDto receiptPaymentDto);
    IPage<ReceiptPaymentDto> bindInvoiceNoRegPage(Page page, @Param("req") ReceiptPaymentDto receiptPaymentDto);

    /**
     * 开票台账详情
@@ -61,6 +61,13 @@
    List<CustomerInteractionDto> customerInteractions (ReceiptPaymentDto receiptPaymentDto);

    /**
     * 客户回款记录查询
     * @param invoiceLedgerDto
     * @return
     */
    List<InvoiceLedgerDto> invoiceLedgerSalesAccount(@Param("invoiceLedgerDto") InvoiceLedgerDto invoiceLedgerDto);

    /**
     * 查询回款记录不分页
     */
    List<ReceiptPaymentDto> receiptPaymentHistoryListNoPage( @Param("params") ReceiptPaymentDto receiptPaymentDto);