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/dao/SysReagentDao.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.java b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.java
index 521dc99..fd7b957 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.java
+++ b/src/main/java/com/nanometer/smartlab/dao/SysReagentDao.java
@@ -12,7 +12,7 @@
 public interface SysReagentDao {
 
     public SysReagent getSysReagent(String id) throws DataAccessException;
-    public SysReagent getSysReagentByCas(SysReagent sysReagent) throws DataAccessException;
+    public List<SysReagent> getSysReagentByCas(SysReagent sysReagent) throws DataAccessException;
     public SysReagent getSysReagentByCas2(SysReagent sysReagent) throws DataAccessException;
     public List<SysReagent> getSysReagentList(Map params) throws DataAccessException;
     public List<SysReagent> getSysReagentListNew(Map params) throws DataAccessException;

--
Gitblit v1.9.2