Merge branch 'master' into pim_meet

buhuazhen

7 天以前 47768d890fbfc1a5f3e93ca26137847361415e9e

 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);

    /**
     * 开票台账详情