解决冲突

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderRentVehicleDetail.java

@@ -395,29 +395,6 @@ public class OrderRentVehicleDetail implements Serializable {
 	@ApiModelProperty(value = "原结束时间")
 	private Long metaEndTime;
 
-	@Column(name = "start_branch_id")
-	@ApiModelProperty(value = "出发隶属的企业id")
-	private Integer startBranchId;
-
-	@Column(name = "end_branch_id")
-	@ApiModelProperty(value = "结束隶属的企业id")
-	private Integer endBranchId;
-
-	@Column(name = "actual_end_branch_id")
-	@ApiModelProperty(value = "实际结束隶属的企业id")
-	private Integer actualEndBranchId;
-
-	@Column(name = "actual_end_company_id")
-	@ApiModelProperty(value = "实际结束公司id")
-	private Integer actualEndCompanyId;
-
-	@Column(name = "vehicle_branch_id")
-	@ApiModelProperty(value = "车辆隶属企业id")
-	private Integer vehicleBranchId;
-
-	@Column(name = "vehicle_company_id")
-	@ApiModelProperty(value = "车辆公司（门店）id")
-	private Integer vehicleCompanyId;
 
 	public Long getEndTime() {
 		return endTime;