From d8a687741273d121586b83745280c57f7e9d3297 Mon Sep 17 00:00:00 2001 From: XiaoRuby <3114200645@qq.com> Date: 星期一, 07 八月 2023 17:51:28 +0800 Subject: [PATCH] Merge branch 'master' of https://gitee.com/yuanchu_code/lims-management-system --- standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java index 7e79daf..56e5501 100644 --- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java +++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java @@ -18,9 +18,8 @@ */ public interface MaterialService extends IService<Material> { - List<Material> selectMaterialLimit(int pageSize,int countSize, int type); + List<Map> selectMaterialLimit(int pageSize,int countSize, int type); - Map selectMaterialById(String materialId); /** * 鍒犻櫎绛変簬MaterialId鐨勬暟鎹� -- Gitblit v1.9.3