From b02535c9a99324823812f6c2d08f066d8e1ba75f Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Mon, 18 Jan 2021 09:57:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/service/OpeApplyService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/OpeApplyService.java b/src/main/java/com/nanometer/smartlab/service/OpeApplyService.java
index b10d0ad..5217844 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeApplyService.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeApplyService.java
@@ -53,9 +53,9 @@
int getOpeApplyReserveTotalCountByName(String id,String reagentName, String personName);
List<OpeApplyReserve> getOpeApplyReserveListByName(String id,String reagentName, String personName, Integer first,
Integer pageSize);
- int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName);
+ int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status);
List<OpeApplyReserve> getOpeApplyReserveListByNameFor(String id,String reagentName, String personName, Integer first,
- Integer pageSize);
+ Integer pageSize,String productSn,String applyCode,Integer status);
public boolean updaetOpeApplyPrice(BigDecimal applyPrice,String id);
public boolean updaetOpeApplyStockFlag(int stockFlag,String id);
public boolean cancelApply(ApplyStatus status,String id);
--
Gitblit v1.9.2