From 9ddb32175b3624ba3a3cedbfc009d9d526391a20 Mon Sep 17 00:00:00 2001 From: Fixiaobai <fixiaobai@163.com> Date: 星期四, 10 八月 2023 11:54:40 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.110.209:9001/r/lims-after --- standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/MaterialMapper.java | 5 ++++- 1 files changed, 4 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 69ac1ec..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 @@ -17,8 +17,11 @@ public interface MaterialMapper extends BaseMapper<Material> { //鏌ヨ鐗╂枡淇℃伅 - List<Material> selectMaterialLimit(int num1,int num2, int type); + 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