From e0ef38a77c4bbe67d8a9eab46134ed00fb1e8293 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 24 八月 2023 10:53:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/MaterialMapper.java |    2 +-
 1 files changed, 1 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 8769e0c..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,7 +24,7 @@
     Map selectMaterialById(String materialId);
 
     // 鍥涚骇鏍�
-    List<Map<String, Object>> FourTree(String specificationsName);
+    List<Map<String, Object>> FourTree();
 
 
 

--
Gitblit v1.9.3