From 83488c1cbce53028c9602d2fc96005528d11fb4c Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 08 八月 2023 14:08:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java
index d6b2662..8fbb6af 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java
@@ -21,7 +21,14 @@
public interface ProductService extends IService<Product> {
void deleteProductInformation(List<Integer> SpecificationsId);
- IPage<Map<String, Object>> pageProductInformation(String productCodeOrName, Page<Objects> page);
+ IPage<Map<String, Object>> pageProductInformation(String productCodeOrName, Integer specificationsId, Page<Objects> page);
List<Map<String, Object>> pageFatherNameProductInformation(String fatherName);
+
+ /**
+ * 閫氳繃椤圭洰鍚嶆煡璇㈤」鐩殑璇曢獙鏂规硶
+ * @param name
+ * @return
+ */
+ List<Map> selectInstrumentByProname(String name);
}
--
Gitblit v1.9.3