Merge remote-tracking branch 'origin/master' into master

gdg

2020-12-01 0b36cae1d52077376b6bf99fcf8ba0fed8081bdc

 src/main/java/com/nanometer/smartlab/dao/SysReagentDao.java

@@ -25,6 +25,9 @@
    public int deleteSysReagent(List<String> ids) throws DataAccessException;

    public List<SysReagent> query();

    //试剂库总数
    int reagentCount(Map params);
    int favorCount(Map params);
    List<SysReagent> favorList(Map params);
    Map getSysReagentDetail(String id);
}