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/mapper/MaterialMapper.java | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/MaterialMapper.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/MaterialMapper.java index ebd51aa..0408808 100644 --- a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/MaterialMapper.java +++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/MaterialMapper.java @@ -15,7 +15,13 @@ * @since 2023-07-17 */ public interface MaterialMapper extends BaseMapper<Material> { - List<Material> selectMaterialLimit(int num1,int num2); + //鏌ヨ鐗╂枡淇℃伅 + List<Map> selectMaterialLimit(int num1,int num2, int type); + + //鏍规嵁鐗╂枡id鏌ヨ鐗╂枡淇℃伅 Map selectMaterialById(String materialId); + + // 鍥涚骇鏍� + List<Map<String, Object>> FourTree(String specificationsName); } -- Gitblit v1.9.3