From 4b55cf8d21443e366f83acf20c4333abef8f54ae Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 21 八月 2023 13:40:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java
index 7e79daf..f6b8b81 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java
@@ -18,9 +18,8 @@
*/
public interface MaterialService extends IService<Material> {
- List<Material> selectMaterialLimit(int pageSize,int countSize, int type);
+ List<Map> selectMaterialLimit(int pageSize,int countSize, int type);
- Map selectMaterialById(String materialId);
/**
* 鍒犻櫎绛変簬MaterialId鐨勬暟鎹�
@@ -40,4 +39,12 @@
* 鍥涚骇鍒嗗眰鏄剧ず
*/
List<Map<String, Object>> getFourLevelInformation(String specificationName);
+
+
+ /**
+ * 娣诲姞鎸囨爣-->閫夋嫨鏍峰搧鍚嶇О
+ * @return
+ */
+ List<String> selectmater();
+
}
--
Gitblit v1.9.3