From 85016ed2734e91e4c8ea03623cde11c29964ba5a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 25 四月 2026 14:00:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
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