From 20956b0f05f81ca47cf6c3e8f9b3b426e9cfd035 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 21:54:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/mom/service/impl/TechniqueServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechniqueServiceImpl.java b/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechniqueServiceImpl.java
index 00cc745..be8ec96 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechniqueServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechniqueServiceImpl.java
@@ -42,8 +42,8 @@
//鍙充笂瑙掓柊澧�-->鐢熶骇宸ヨ壓-->閫夋嫨宸ュ簭,宸ヨ壓
@Override
- public List<Map<String, Object>> chooseTech(Integer specificationsId) {
- return technologyMapper.chooseTech(specificationsId);
+ public List<Map<String, Object>> chooseTech(Integer specificationsId,Integer version) {
+ return technologyMapper.chooseTech(specificationsId,version);
}
//鍙充笂瑙掓柊澧�-->鐢熶骇宸ヨ壓-->閫夋嫨璁惧
@@ -60,10 +60,9 @@
//鍙充笂瑙掓柊澧�-->鐢熶骇宸ヨ壓
@Override
- public void addTechnique(Integer technologyId, TechniqueDto techniqueDto) {
+ public void addTechnique(TechniqueDto techniqueDto) {
Technique technique = new Technique();
BeanUtils.copyProperties(techniqueDto, technique);
- technique.setTechnologyId(technologyId);
techniqueMapper.insert(technique);
}
--
Gitblit v1.9.3