From 2e67b4a6d474c584daf2ab1ff1df9d785f902b96 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 14 八月 2025 19:41:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim_ywx' into pim_ywx
---
src/main/java/com/ruoyi/warehouse/mapper/WarehouseMapper.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/mapper/WarehouseMapper.java b/src/main/java/com/ruoyi/warehouse/mapper/WarehouseMapper.java
index 0e247ec..9d11b84 100644
--- a/src/main/java/com/ruoyi/warehouse/mapper/WarehouseMapper.java
+++ b/src/main/java/com/ruoyi/warehouse/mapper/WarehouseMapper.java
@@ -7,6 +7,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
/**
* @author 86151
* @description 閽堝琛ㄣ�恮arehouse(浠撳簱琛�)銆戠殑鏁版嵁搴撴搷浣淢apper
@@ -16,7 +18,7 @@
@Mapper
public interface WarehouseMapper extends BaseMapper<Warehouse> {
- IPage<Warehouse> listPage(Page page,@Param("warehouse") Warehouse warehouse);
+ List<Warehouse> listPage(@Param("warehouse") Warehouse warehouse);
}
--
Gitblit v1.9.3