From f32e75ed3d34f31da74c0199d53139268e9cd560 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 28 八月 2023 11:53:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/RawMaterialService.java | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/RawMaterialService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/RawMaterialService.java
index 143225f..f022a88 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/RawMaterialService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/RawMaterialService.java
@@ -22,20 +22,14 @@
*/
public interface RawMaterialService extends IService<RawMaterial> {
- IPage<RawMaterial> selectRawMaterial(String materialCoding, String materialName, Integer condition, String createTime, Page<Objects> page);
+ IPage<RawMaterial> selectRawMaterial(String materialCoding, String materialName, Integer type, String createTime, Page<Objects> page);
/**
* 鏌ヨ鍘熸潗鏂欐楠�
*
* @return
*/
- List<RawMaterial> selectRawmaAll();
+ List<Map<String, Object>> selectRawmaAll();
- /**
- * 閫夋嫨鍘熸潗鏂欐姤妫�
- *
- * @param id
- * @return
- */
- InspectionVo selectRawmaById(Integer id, String startTime, String endTime) throws ParseException;
+
}
--
Gitblit v1.9.3