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

lyfO_o

2021-06-21 4d3856e802d5c9d28d8654f35da426bdb517d7d4

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

@@ -47,4 +47,7 @@
   List<OpeWarehouseReserve> selectWarehouseByRidAndArticleNumberAndWarehouse(String id, String articleNumber, String warehouseId);

   void updateBtReserve(String id,Integer useNum);

   //根据试剂Id查找当前库存
    int countByReagentId(String id);
}