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 | 6 +++++-
1 files changed, 5 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 6e5e119..444aacc 100644
--- a/src/main/java/com/zy/asrs/service/MatService.java
+++ b/src/main/java/com/zy/asrs/service/MatService.java
@@ -4,10 +4,14 @@
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.Mat;
+import java.util.List;
+
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);
+ List<Mat> exportData(Object matnr, Object maktx, Object specs);
+
}
--
Gitblit v1.9.1