From 151bc3c31c4c9913ce864ff65068cec2c5c614a3 Mon Sep 17 00:00:00 2001 From: XiaoRuby <3114200645@qq.com> Date: 星期一, 28 八月 2023 09:45:47 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/MaterialMapper.java | 5 ++--- 1 files changed, 2 insertions(+), 3 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 08b370e..f7ed23e 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 @@ -24,10 +24,9 @@ Map selectMaterialById(String materialId); // 鍥涚骇鏍� - List<Map<String, Object>> FourTree(String specificationsName); + List<Map<String, Object>> FourTree(); - //閫夋嫨鏍峰搧鍚嶇О - List<String> selectmater(); + -- Gitblit v1.9.3