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

lyfO_o

2021-06-25 178788d231d7d891c1874635b8e11dd951fc4230

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

@@ -182,6 +182,16 @@
        return reagentIds.get(0);
    }

    @Override
    public SysReagent getRowData(String rowKey) {
        return sysReagentDao.getRowData(rowKey);
    }

    @Override
    public SysReagent getSysReagentListNewRowData(String rowKey) {
        return sysReagentDao.getSysReagentListNewRowData(rowKey);
    }


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