From e046347e21a3bb4aa4ae4eb80f54bbfadb652132 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 15 一月 2026 09:11:49 +0800
Subject: [PATCH] Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New
---
src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java b/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java
index 435a065..dbe8971 100644
--- a/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java
+++ b/src/main/java/com/ruoyi/sales/service/ReceiptPaymentService.java
@@ -6,11 +6,9 @@
import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.ReceiptPaymentDto;
import com.ruoyi.sales.pojo.ReceiptPayment;
-import org.apache.ibatis.annotations.Param;
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
-import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -21,7 +19,7 @@
* @param receiptPayment
* @return
*/
- int receiptPaymentSaveOrUpdate(ReceiptPayment receiptPayment);
+ int receiptPaymentSaveOrUpdate(List<ReceiptPayment> receiptPayment);
/**
* 鍥炴鐧昏淇敼
@@ -86,7 +84,7 @@
* @param receiptPaymentDto
* @return
*/
- List<CustomerInteractionDto> customerInteractions (ReceiptPaymentDto receiptPaymentDto);
+ List<InvoiceLedgerDto> customerInteractions (InvoiceLedgerDto receiptPaymentDto);
/**
* 鏌ヨ鍥炴璁板綍鍒嗛〉
@@ -101,5 +99,5 @@
/**
* 閮ㄥ垎瀵煎嚭鍥炴鍒楄〃
*/
- void exportPaymentList(HttpServletResponse response, ArrayList<Long> ids);
+ void exportPaymentList(HttpServletResponse response, List<Long> ids);
}
--
Gitblit v1.9.3