Merge branch 'master-background-manager' into base-modify

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleModel.java

@@ -134,6 +134,7 @@ public class VehicleModel implements Serializable {
 	private Integer hotSign;
 
 	@ApiModelProperty(value = "是否删除")
+	@Column(name = "isdel")
 	private  Integer isdel;
 	@Column(name = "rent_discount_status")
 	@ApiModelProperty(value = "租车优惠状态 0--没有优惠;1--会员折扣;2--固定值")