From dd571bf55de7f9a72d458adc179958ed2f9473c0 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 21 八月 2023 09:39:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java
index cbf5b02..ff4ec4e 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java
@@ -23,12 +23,9 @@
//鏍规嵁鐗╂枡id鏌ヨ妫�楠岄」鐩�
List<Map> selectProductByMaterialId(int materialId);
- IPage<Map<String, Object>> pageProductInformation(String productCodeOrName, Integer specificationsId, Page<Objects> page);
+ //灞曠ず璇ュ瀷鍙蜂笅鐨勬楠岄」鐩姹�
+ List<Map<String, Object>> pageProductInformation(Integer specificationsId);
- Map<String, Object> selectOneChildren(Object father);
- Map<String, Object> getProductInformation(Integer productId);
- //閫氳繃椤圭洰鍚嶆煡璇㈤」鐩殑璇曢獙鏂规硶
- List<Map> selectInstrumentByProname(String name);
}
--
Gitblit v1.9.3