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

lyfO_o

2021-06-25 178788d231d7d891c1874635b8e11dd951fc4230

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

@@ -678,6 +678,11 @@
    }

    @Override
    public OpeWarehouseReserve getRowData(String rowKey) {
        return opeWarehouseReserveDao.getRowData(rowKey);
    }

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