From b02535c9a99324823812f6c2d08f066d8e1ba75f Mon Sep 17 00:00:00 2001 From: gdg <764716047@qq.com> Date: 星期一, 18 一月 2021 09:57:14 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' 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