Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -335,6 +335,8 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         RentVehicleBookDTO rentVehicleBookDTO = BeanUtil.toBean(detail.getBookVehicleVO(), RentVehicleBookDTO.class);
         rentVehicleBookDTO.setModelId(detail.getModelId());
         rentVehicleBookDTO.setUserName(BaseContextHandler.getName());
+        rentVehicleBookDTO.setLiftCompany(detail.getStartCompanyId());
+        rentVehicleBookDTO.setLiftAddr(detail.getStartAddr());
         ObjectRestResponse<VehicleBookRecord> orr = vehicleFeign.rentApplyVehicle(rentVehicleBookDTO);
         if(! CommonConstants.SYS_JSON_TRUE.equals(orr.getStatus())) {
             throw new BaseException(orr.getMessage(), orr.getStatus());

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -67,7 +67,7 @@ public interface VehicleFeign {
 
     @RequestMapping(value = "/user/license/company/getOne", method = RequestMethod.GET)
     public RestResponse<VehicleUserLicense> getOne(
-            @RequestParam(value="id",defaultValue="0")Integer  id) throws Exception ;
+            @RequestParam(value="id",defaultValue="0")Integer  id) throws Exception;
 
     /**
      * 获取优质车型接口