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

lyfO_o

2021-03-31 e1cce0b77f02cf43024a6142bf49d75566ac2181

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

@@ -339,7 +339,6 @@
            ors.setContainerId(reagentReceiving.getLabContainerId());
            ors.setHouseId(reagentReceiving.getLabId());
            ors.setUserId(reagentReceiving.getApplyUserId());
            opeReagentStatusService.updateReagentStatus(ors);

            if (opeReagentStatusService.isAllowWarehouseUse(ors)) {
                // 减少库存