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/service/WarehouseService.java |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/warehouse/service/WarehouseService.java b/src/main/java/com/ruoyi/warehouse/service/WarehouseService.java
index 5981162..8d7274c 100644
--- a/src/main/java/com/ruoyi/warehouse/service/WarehouseService.java
+++ b/src/main/java/com/ruoyi/warehouse/service/WarehouseService.java
@@ -1,8 +1,6 @@
 package com.ruoyi.warehouse.service;
 
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.warehouse.pojo.Warehouse;
 
@@ -15,7 +13,7 @@
 */
 public interface WarehouseService extends IService<Warehouse> {
 
-    IPage<Warehouse> listPage(Page page, Warehouse warehouse);
+    List<Warehouse> listPage( Warehouse warehouse);
 
     boolean deleteByIds(List<Long> ids);
 }

--
Gitblit v1.9.3