From f1fdbb9fbe3614e1b9b798e0219e17e8c520e0ce Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期二, 19 八月 2025 16:29:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs
---
src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java | 6 ++++--
1 files changed, 4 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 f7b239e..2bb6c66 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
@@ -13,8 +13,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 memo) {
+ return page.setRecords(baseMapper.listByPage(page, tagId, matnr, memo));
}
@Override
public Page<Mat> getPage2(Page page, String tagId, Object matnr, Object maktx, Object specs) {
@@ -42,4 +42,6 @@
+
+
}
--
Gitblit v1.9.1