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

lyfO_o

2021-06-21 4d3856e802d5c9d28d8654f35da426bdb517d7d4

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

@@ -24,6 +24,8 @@

    int updateOpeWarehouseReserve(OpeWarehouseReserve opeWarehouseReserve);

    int updateOpeWarehouseReserve2(OpeWarehouseReserve opeWarehouseReserve);

    OpeWarehouseReserve getOpeWarehouseReserve(OpeWarehouseReserve opeWarehouseReserve);

    List<OpeWarehouseReserve> selectByReId(String id);
@@ -39,4 +41,6 @@
    List<OpeWarehouseReserve> selectWarehouseByRidAndArtiNumberAndWid(Map params);

    void updateBtReserve(String id, Integer useNum);

    Integer countByReagentId(String id);
}