From bacec153f688bcee10795bd38f61b2406c20e488 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期二, 24 九月 2024 16:35:45 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/ShelfRackService.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/ShelfRackService.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/ShelfRackService.java index d66b35e..39102e0 100644 --- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/ShelfRackService.java +++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/shelfrack/service/ShelfRackService.java @@ -2,8 +2,11 @@ import com.mes.shelfrack.entity.ShelfRack; import com.baomidou.mybatisplus.extension.service.IService; +import com.mes.shelfrack.entity.request.RawUsageAndShelfRack; import java.util.List; +import java.util.Map; + /** * @author system * @since 2024-07-09 14:51:27 @@ -12,6 +15,6 @@ List<ShelfRack> findList(ShelfRack params); - + List<RawUsageAndShelfRack> selectshelf_rack(); } \ No newline at end of file -- Gitblit v1.8.0