From 358d17658629931964ad421be77c94240310ed63 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 26 六月 2024 13:27:36 +0800
Subject: [PATCH] Merge branch 'phpsasrs' of http://47.97.1.152:5880/r/zy-asrs into phpsasrs
---
src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 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..95654f1 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
@@ -11,8 +11,8 @@
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 batch) {
+ return page.setRecords(baseMapper.listByPage(page, tagId, matnr, maktx, batch));
}
--
Gitblit v1.9.1