From 3a02139973ac37129c0b9e23d5bdbfa19550f617 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 18 八月 2023 17:27:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inventory-server/src/main/java/com/yuanchu/mom/service/RepertoryService.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/service/RepertoryService.java b/inventory-server/src/main/java/com/yuanchu/mom/service/RepertoryService.java
index 54bec43..e3f3951 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/service/RepertoryService.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/RepertoryService.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.pojo.Repertory;
+import java.util.List;
import java.util.Map;
/**
@@ -24,6 +25,7 @@
* @param type
* @return
*/
- IPage<Map<String, Object>> selectAllRepertory(Page<Object> page, String name, String specifications, String time, Integer type);
+ IPage<Map<String, Object>> selectAllRepertory(Page<Object> page, String name, String specifications, String time, Integer type,Integer result);
+
}
--
Gitblit v1.9.3