From 9a5d984a74d5f893fc51366b42391d9b4f8a83ed Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期四, 12 三月 2026 15:40:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/sales/service/ShippingInfoService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java b/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java
index 3f2f1d3..2aa1a13 100644
--- a/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java
+++ b/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java
@@ -7,6 +7,7 @@
import com.ruoyi.sales.dto.SalesLedgerProductDto;
import com.ruoyi.sales.dto.ShippingInfoDto;
import com.ruoyi.sales.pojo.ShippingInfo;
+import org.apache.ibatis.annotations.Param;
import java.io.IOException;
import java.util.List;
@@ -22,7 +23,7 @@
boolean delete(List<Long> ids);
- List<SalesLedgerProductDto> getReturnManagementDtoById(Long shippingId);
+ List<SalesLedgerProductDto> getReturnManagementDtoById( Long shippingId);
List<ShippingInfo> getShippingInfoByCustomerName(String customerName);
}
--
Gitblit v1.9.3