From 4ad61e4c257621124625a89853eaa8334a11b0be Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 09 九月 2023 11:26:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inventory-server/src/main/java/com/yuanchu/mom/service/impl/RepertoryServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/RepertoryServiceImpl.java b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/RepertoryServiceImpl.java
index e2f095d..088ba9b 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/RepertoryServiceImpl.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/RepertoryServiceImpl.java
@@ -9,6 +9,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.List;
import java.util.Map;
/**
@@ -25,8 +26,8 @@
//鏌ヨ鎵�鏈夊簱瀛樺垪琛�
@Override
- public IPage<Map<String, Object>> selectAllRepertory(Page<Object> page, String name, String specifications, String time, Integer type) {
- return repertoryMapper.selectAllRepertory(page,name,specifications,time,type);
+ public IPage<Map<String, Object>> selectAllRepertory(Page<Object> page, String name, String specifications, String time, Integer type,Integer result) {
+ return repertoryMapper.selectAllRepertory(page,name,specifications,time,type,result);
}
}
--
Gitblit v1.9.3