From beddea151f8995d56efa0e133ddfa4e567f5a671 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 14 五月 2026 14:28:58 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_西宁_青铝绿行

---
 src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java b/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java
index 85a7a4c..49378c8 100644
--- a/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java
+++ b/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java
@@ -7,7 +7,7 @@
 import com.ruoyi.sales.dto.ReceiptPaymentDto;
 import com.ruoyi.sales.pojo.ReceiptPayment;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
@@ -19,7 +19,7 @@
      * @param receiptPayment
      * @return
      */
-    int receiptPaymentSaveOrUpdate(ReceiptPayment receiptPayment);
+    int receiptPaymentSaveOrUpdate(List<ReceiptPayment> receiptPayment);
 
     /**
      * 鍥炴鐧昏淇敼
@@ -84,7 +84,7 @@
      * @param receiptPaymentDto
      * @return
      */
-    List<CustomerInteractionDto> customerInteractions (ReceiptPaymentDto receiptPaymentDto);
+    List<InvoiceLedgerDto> customerInteractions (InvoiceLedgerDto receiptPaymentDto);
 
     /**
      * 鏌ヨ鍥炴璁板綍鍒嗛〉

--
Gitblit v1.9.3