Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java

@@ -399,10 +399,10 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			log.error("WarehouseId参数错误+{" + distributionReservationDTO.getWarehouseId() + "}");
 			return R.status(false);
 		}
-		if (Func.isEmpty(distributionReservationDTO.getWarehouseName())){
-			log.error("WarehouseName参数错误+{" + distributionReservationDTO.getWarehouseName() + "}");
-			return R.status(false);
-		}
+//		if (Func.isEmpty(distributionReservationDTO.getWarehouseName())){
+//			log.error("WarehouseName参数错误+{" + distributionReservationDTO.getWarehouseName() + "}");
+//			return R.status(false);
+//		}
 //		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 //		if (Func.isEmpty(myCurrentWarehouse)) {
 //			return R.fail("无仓库信息!!!");