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

gdg

2021-01-26 f5ccc7e9ca548c6bddf51ebe8e943fc09a3b2ff4

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

@@ -42,7 +42,7 @@

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

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

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