From ecd6e50d0bb2c74e4b3f7a23e0d44f5e001987ea Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 23 四月 2026 13:57:47 +0800
Subject: [PATCH] 冲突解决
---
src/main/java/com/ruoyi/sales/mapper/ShippingInfoMapper.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/mapper/ShippingInfoMapper.java b/src/main/java/com/ruoyi/sales/mapper/ShippingInfoMapper.java
index 88dec8a..3054796 100644
--- a/src/main/java/com/ruoyi/sales/mapper/ShippingInfoMapper.java
+++ b/src/main/java/com/ruoyi/sales/mapper/ShippingInfoMapper.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.sales.pojo.ShippingInfo;
+import com.ruoyi.sales.vo.ShippingInfoVo;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -13,7 +14,7 @@
* @date : 2025/10/22 9:32
*/
public interface ShippingInfoMapper extends BaseMapper<ShippingInfo> {
- IPage<ShippingInfo> listPage(Page page,@Param("req") ShippingInfo req);
+ IPage<ShippingInfoVo> listPage(Page page, @Param("req") ShippingInfo req);
List<ShippingInfo> listAll();
}
--
Gitblit v1.9.3