From 833a285ef00a84fc1a88464eb3d7d1934cf71ff6 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 23 四月 2026 14:45:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子

---
 src/main/java/com/ruoyi/sales/service/ShippingInfoService.java |    2 +-
 1 files changed, 1 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 81bcf6e..d9a3a8c 100644
--- a/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java
+++ b/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java
@@ -14,7 +14,7 @@
  * @date : 2025/10/22 9:33
  */
 public interface ShippingInfoService extends IService<ShippingInfo>{
-    IPage<ShippingInfo> listPage(Page page, ShippingInfo req);
+    IPage<ShippingInfoDto> listPage(Page page, ShippingInfo req);
 
     boolean deductStock(ShippingInfoDto req) throws IOException;
 

--
Gitblit v1.9.3