Merge branch 'master-bug' into dev

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

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/RentVehicleBookDTO.java

@@ -57,6 +57,9 @@ public class RentVehicleBookDTO extends PageParam {
     @ApiModelProperty("订单号")
     private String orderNo;
 
+    @ApiModelProperty("停靠公司id")
+    Integer parkBranchCompanyId;
+
     /**
      * 随车物品id以及数量 List<Map<id,数量>>
      */