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

lyfO_o

2021-06-16 b510b274d9003d0a643a43c1e01b1382d84f78ec

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

@@ -1129,5 +1129,12 @@
      ExcelUtils.export2Excel(list,"实验室库存",map);
   }

    @Override
    public OpeReagentStatus getStatus(String reagentId, String reagentCode) {


      return opeReagentStatusDao.getStatus(reagentId,reagentCode);
    }


}