From c6c30ead51b2ac1f7ffd4fb7e4b193c5d11d7bdf Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 27 七月 2023 16:02:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 4536735..10e6bb1 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
@@ -22,7 +22,12 @@
List<Product> selectProductByMaterialId(String materialId);
- IPage<Map<String, Object>> pageProductInformation(String productCodeOrName, Page<Objects> page);
+ IPage<Map<String, Object>> pageProductInformation(String productCodeOrName, Integer specificationsId, Page<Objects> page);
Map<String, Object> selectOneChildren(Object father);
+
+ Map<String, Object> getProductInformation(Integer productId);
+
+ //閫氳繃椤圭洰鍚嶆煡璇㈤」鐩殑璇曢獙鏂规硶
+ List<Map> selectInstrumentByProname(String name);
}
--
Gitblit v1.9.3