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

gdg

2021-02-01 1cbac7aa20a183a9a893651bf0cef24b1909eb5c

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

@@ -38,11 +38,11 @@
   public List<OpeWarehouseReserve> selectByReId(String id);
   public void updateByReId(String newReId,String oldReId);

   void insertOpeWarehouseReserve2(OpeApplyReserve opeApplyReserve, OpeOrder oo);
   void insertOpeWarehouseReserve2(OpeApplyReserve opeApplyReserve, OpeOrder oo,String consigneeId);

   List<OpeWarehouseReserve> selectWarehouseByReagentIdAndArticleNumber(String id,String articleNumber,boolean flag);

   void btWarehouseReserveReduce(List<OpeApplyReserve> opeList,String userId);
   void btWarehouseReserveReduce(List<OpeApplyReserve> opeList);

   List<OpeWarehouseReserve> selectWarehouseByRidAndArticleNumberAndWarehouse(String id, String articleNumber, String warehouseId);