Merge remote-tracking branch 'origin/master'

李宇

2021-06-25 e8a3e262f0c129e02f08a2b1ba15bcbb9a733d51

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

@@ -668,7 +668,16 @@
      opeWarehouseReserveDao.updateBtReserve(id, useNum);
   }

   @Override
    @Override
    public int countByReagentId(String id) {
      int num = 0;
      if (opeWarehouseReserveDao.countByReagentId(id) != null) {
         num = opeWarehouseReserveDao.countByReagentId(id);
      }
      return num;
    }

    @Override
   public void btWarehouseReserveReduce(List<OpeApplyReserve> opeList) {
      if (opeList.size() < 1) {
         return;