From 924d018e6e6f15effbd272cead5dff67cd3b93a5 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 23 八月 2023 16:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 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 0408808..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
@@ -16,6 +16,7 @@
  */
 public interface MaterialMapper extends BaseMapper<Material> {
 
+
     //鏌ヨ鐗╂枡淇℃伅
     List<Map> selectMaterialLimit(int num1,int num2, int type);
 
@@ -23,5 +24,10 @@
     Map selectMaterialById(String materialId);
 
     // 鍥涚骇鏍�
-    List<Map<String, Object>> FourTree(String specificationsName);
+    List<Map<String, Object>> FourTree();
+
+
+
+
+
 }

--
Gitblit v1.9.3