From 58579a382615c0f9bd03b52ae7227a2ca64f43f3 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期三, 23 八月 2023 16:43:21 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java index 1c66d67..6650cf6 100644 --- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java +++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java @@ -120,8 +120,8 @@ } @Override - public List<Map<String, Object>> getFourLevelInformation(String specificationName) { - return materialMapper.FourTree(specificationName); + public List<Map<String, Object>> getFourLevelInformation() { + return materialMapper.FourTree(); } //娣诲姞鎸囨爣-->閫夋嫨鏍峰搧鍚嶇О -- Gitblit v1.9.3