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 | 14 +++++++++++++-
1 files changed, 13 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 ebd51aa..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
@@ -15,7 +15,19 @@
* @since 2023-07-17
*/
public interface MaterialMapper extends BaseMapper<Material> {
- List<Material> selectMaterialLimit(int num1,int num2);
+
+ //鏌ヨ鐗╂枡淇℃伅
+ List<Map> selectMaterialLimit(int num1,int num2, int type);
+
+ //鏍规嵁鐗╂枡id鏌ヨ鐗╂枡淇℃伅
Map selectMaterialById(String materialId);
+
+ // 鍥涚骇鏍�
+ List<Map<String, Object>> FourTree();
+
+
+
+
+
}
--
Gitblit v1.9.3