From ea5e88b0c6f5be4d0c6637b5e7bba94ee85f9673 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 26 五月 2023 08:58:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
index 8abf584..f8a5781 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
@@ -7,12 +7,14 @@
import com.zy.asrs.mapper.MatMapper;
import com.zy.asrs.service.MatService;
+import java.util.List;
+
@Service("matService")
public class MatServiceImpl extends ServiceImpl<MatMapper, Mat> implements MatService {
@Override
- public Page<Mat> getPage(Page page, String tagId, Object matnr, Object maktx) {
- return page.setRecords(baseMapper.listByPage(page, tagId, matnr, maktx));
+ public Page<Mat> getPage(Page page, String tagId, Object matnr, Object maktx, Object specs) {
+ return page.setRecords(baseMapper.listByPage(page, tagId, matnr, maktx, specs));
}
@@ -21,5 +23,8 @@
return this.baseMapper.selectByMatnr(matnr);
}
-
+ @Override
+ public List<Mat> exportData(Object matnr, Object maktx, Object specs) {
+ return this.baseMapper.exportData(matnr, maktx, specs);
+ }
}
--
Gitblit v1.9.1