From 298b5c1e9aad4d64a160c35262320988671489eb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 19 十月 2022 16:18:26 +0800
Subject: [PATCH] Merge branches 'bfasrs' and 'ynasrs' of http://47.97.1.152:5880/r/zy-asrs into ynasrs

---
 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 3b4b655..6e5e119 100644
--- a/src/main/java/com/zy/asrs/service/MatService.java
+++ b/src/main/java/com/zy/asrs/service/MatService.java
@@ -6,7 +6,7 @@
 
 public interface MatService extends IService<Mat> {
 
-    Page<Mat> getPage(Page page, String tagId, Object matnr, Object maktx);
+    Page<Mat> getPage(Page page, String tagId, Object matnr, Object maktx, Object specs);
 
     Mat selectByMatnr(String matnr);
 

--
Gitblit v1.9.1