From 8f98ff2e202e5d7a39be484753db63d0165d70d7 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 10 一月 2026 15:12:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_tide_sbjkxt' into dev_tide_sbjkxt_xindao
---
src/main/java/com/ruoyi/warehouse/service/WarehouseService.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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..0b68de8 100644
--- a/src/main/java/com/ruoyi/warehouse/service/WarehouseService.java
+++ b/src/main/java/com/ruoyi/warehouse/service/WarehouseService.java
@@ -1,9 +1,10 @@
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.dto.WarehouseDto;
+import com.ruoyi.warehouse.dto.WarehouseGoodsShelvesDto;
+import com.ruoyi.warehouse.dto.WarehouseTreeDto;
import com.ruoyi.warehouse.pojo.Warehouse;
import java.util.List;
@@ -15,7 +16,9 @@
*/
public interface WarehouseService extends IService<Warehouse> {
- IPage<Warehouse> listPage(Page page, Warehouse warehouse);
-
boolean deleteByIds(List<Long> ids);
+
+ List<Warehouse> findList(Warehouse warehouse);
+
+ List<WarehouseTreeDto> findListTree();
}
--
Gitblit v1.9.3