From 1cbac7aa20a183a9a893651bf0cef24b1909eb5c Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 01 二月 2021 10:19:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master

---
 src/main/java/com/nanometer/smartlab/service/SysReagentService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/SysReagentService.java b/src/main/java/com/nanometer/smartlab/service/SysReagentService.java
index b51db5b..775a88f 100644
--- a/src/main/java/com/nanometer/smartlab/service/SysReagentService.java
+++ b/src/main/java/com/nanometer/smartlab/service/SysReagentService.java
@@ -20,12 +20,12 @@
     public int insertSysReagentList(List<SysReagent> sysReagentList);
     public int insertSysReagentList2(List<SysReagent> sysReagentList);
 
-    int getSysReagentTotalCountNew(String name, String cas, String supplierId, Integer type);
+    int getSysReagentTotalCountNew(String name, String cas, String supplierId, Integer type,String productSn);
     public List<SysReagent> query();
 
     Map getReagentDetail(String id);
 
-    public List<SysReagent> getSysReagentListNew(String name, String cas, String supplierId, Integer type, Integer first, Integer pageSize);
+    public List<SysReagent> getSysReagentListNew(String name, String cas, String supplierId, Integer type, Integer first, Integer pageSize,String productSn);
 
     int favorCount(SysUser user, String name, String cas, String supplierId, String productSn,Integer favorFlag);
 

--
Gitblit v1.9.2