From d0a6fc23f31f924cb1744397478dc4c7c57c04e1 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 19 八月 2023 09:58:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/MaterialService.java | 3 +--
1 files changed, 1 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..56e5501 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鐨勬暟鎹�
--
Gitblit v1.9.3