From 8f0d649d83de955cfcbf38ebdbfc90a70c6ac547 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 11 十月 2023 10:24:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6

---
 src/main/java/com/zy/asrs/service/MatService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/MatService.java b/src/main/java/com/zy/asrs/service/MatService.java
index d17d198..444aacc 100644
--- a/src/main/java/com/zy/asrs/service/MatService.java
+++ b/src/main/java/com/zy/asrs/service/MatService.java
@@ -8,7 +8,7 @@
 
 public interface MatService extends IService<Mat> {
 
-    Page<Mat> getPage(Page page, String tagId, Object matnr, Object maktx, Object specs);
+    Page<Mat> getPage(Page page, String tagId, Object matnr, Object maktx, Object specs, Object matType);
 
     Mat selectByMatnr(String matnr);
 

--
Gitblit v1.9.1