From f77a2eba10ce3f430d31a34790a8a1184c8069e6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 22 八月 2023 11:50:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductModelServiceImpl.java | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductModelServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductModelServiceImpl.java
index d2bdf8c..a42754d 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductModelServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductModelServiceImpl.java
@@ -28,13 +28,10 @@
@Resource
ProductModelMapper productModelMapper;
- @Resource
- MaterialMapper materialMapper;
-
//閫夋嫨鏍峰搧
@Override
public List<String> selectmater() {
- return materialMapper.selectmater();
+ return productModelMapper.selectmater();
}
//娣诲姞鏍囧噯-->閫夋嫨椤圭洰鍒嗙粍
@@ -58,10 +55,6 @@
BeanUtils.copyProperties(productModelDto, productModel);
productModelMapper.insert(productModel);
}
- //娣诲姞鐗╂枡浜у搧搴�
- Material material = new Material();
- material.setName(productModelDto.getMaterial()).setCode(MyUtil.getTimeSixNumberCode("CP", "CP"));
- materialMapper.insert(material);
}
//鏌ヨ鏍囧噯妯＄増鍒楄〃
--
Gitblit v1.9.3