From 0e4272399c014a3c6987ef4bd7d70f6ad90610ce Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 15 十月 2025 18:02:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/warehouse/mapper/WarehouseMapper.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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..392f8ca 100644
--- a/src/main/java/com/ruoyi/warehouse/mapper/WarehouseMapper.java
+++ b/src/main/java/com/ruoyi/warehouse/mapper/WarehouseMapper.java
@@ -1,11 +1,13 @@
package com.ruoyi.warehouse.mapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import com.ruoyi.warehouse.dto.WarehouseDto;
import com.ruoyi.warehouse.pojo.Warehouse;
import org.apache.ibatis.annotations.Mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* @author 86151
@@ -15,8 +17,8 @@
*/
@Mapper
public interface WarehouseMapper extends BaseMapper<Warehouse> {
-
- IPage<Warehouse> listPage(Page page,@Param("warehouse") Warehouse warehouse);
+ List<WarehouseDto> findList(@Param("warehouse") Warehouse warehouse);
+ List<Warehouse> listAll(@Param("warehouse") Warehouse warehouse);
}
--
Gitblit v1.9.3