Merge branch 'master_chw_publish' into dev-chw

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehiclePublishReceiveBiz.java

@@ -121,7 +121,7 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
             throw  new BaseException("参数不能为空", ResultCode.FAILED_CODE);
         }
         VehiclePublish vehiclePublish = vehiclePublishBiz.selectById(publishId);
-        if (vehiclePublish == null || (vehiclePublish.getWaitConfirmNumber()+vehiclePublish.getConfirmNumber()) >= vehiclePublish.getNumber()){
+        if (vehiclePublish == null || ( receiveType == 1 && (vehiclePublish.getWaitConfirmNumber()+vehiclePublish.getConfirmNumber()) >= vehiclePublish.getNumber()) ){
             throw  new BaseException("需求不存在或已满", ResultCode.FAILED_CODE);
         }
         publishReceiveDTO.setVehiclePublish(vehiclePublish);