From 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 13:30:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java | 8 +++++++-
1 files changed, 7 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 5abf378..13958cd 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
@@ -24,7 +24,13 @@
List<Map> selectProductByMaterialId(int materialId);
//灞曠ず璇ュ瀷鍙蜂笅鐨勬楠岄」鐩姹�
- List<Map<String, Object>> pageProductInformation(Integer specificationsId);
+ List<Map<String, Object>> pageProductInformation(Integer specificationsId,Integer version);
void deleteList(String ids);
+
+ //灞曠ず璇ュ瀷鍙蜂笅鐨勬楠岄」鐩姹�-->閫夋嫨鐗堟湰
+ List<Integer> chooseVersion(Integer specificationsId);
+
+ //鏌ヨ璇ュ瀷鍙蜂笅鐨勬墍鏈夎瘯楠岄」鐩�(鐖剁被)
+ List<Map<String,Object>> chooseProject(Integer modelId);
}
--
Gitblit v1.9.3