Merge remote-tracking branch 'origin/base-modify' into base-modify

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

@@ -216,7 +216,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
                     vehicleFeign.unbookVehicle(orvd.getBookRecordId());
                 }else {
                     //未支付，拒绝之前的预约
-                    vehicleFeign.rentRejectVehicleBooking(orvd.getBookRecordId());
+                    RestResponse<Integer> restResponse = vehicleFeign.rentRejectVehicleBooking(orvd.getBookRecordId());
                 }
 
                 //取消租车免费天数使用

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -248,6 +248,7 @@ public class VehicleController extends BaseController<VehicleBiz> {
      */
     @RequestMapping(value = "/rent/book/reject/{bookRecordId}", method = RequestMethod.PUT)
     @ApiOperation(value = "租车拒绝预定车辆")
+    @IgnoreUserToken
     public RestResponse<Integer> rentRejectVehicleBooking(@PathVariable Long bookRecordId) throws Exception {
         //默认USER_APP 预约
         Integer operatorId = USER_APP;