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

gdg

2020-12-10 b805858ea0341e13f6213c3a9b01da6a13d22f83

 src/main/java/com/nanometer/smartlab/service/SysReagentServiceImpl.java

@@ -133,9 +133,15 @@
        params.put("productSn", productSn);
        params.put("first", first);
        params.put("pageSize", pageSize);
        params.put("MaxSize", first+pageSize);
        return sysReagentDao.reagentList(params);
    }

    @Override
    public String getReagentUnitByReagentId(String reagentId) {
        return sysReagentDao.getReagentUnitByReagentId(reagentId);
    }


    @Transactional(propagation = Propagation.REQUIRED)
    public int getSysReagentTotalCount(String name, String cas, String supplierId,Integer type) {