From 3f0e25410f5aa3f01fda3d2d6410d89dc74159f3 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 19 八月 2023 15:16:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 standard-server/src/main/java/com/yuanchu/limslaboratory/service/ProductService.java |    9 +++------
 1 files changed, 3 insertions(+), 6 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 8fbb6af..cb7502c 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,14 +21,11 @@
 public interface ProductService extends IService<Product> {
     void deleteProductInformation(List<Integer> SpecificationsId);
 
-    IPage<Map<String, Object>> pageProductInformation(String productCodeOrName, Integer specificationsId, Page<Objects> page);
-
-    List<Map<String, Object>> pageFatherNameProductInformation(String fatherName);
 
     /**
-     * 閫氳繃椤圭洰鍚嶆煡璇㈤」鐩殑璇曢獙鏂规硶
-     * @param name
+     * 灞曠ず璇ュ瀷鍙蜂笅鐨勬楠岄」鐩姹�
+     * @param specificationsId
      * @return
      */
-    List<Map> selectInstrumentByProname(String name);
+    List<Map<String,Object>> pageProductInformation(Integer specificationsId);
 }

--
Gitblit v1.9.3