From 78c62a33671bdcfb0f2019c520f807a4c56fc741 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 07 八月 2023 09:02:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/MaterialMapper.java | 5 ++++-
1 files changed, 4 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 63a2e7e..0408808 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
@@ -17,8 +17,11 @@
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(String specificationsName);
}
--
Gitblit v1.9.3