Merge branch 'master-bug-vehiclemodel-hf'

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/HomeActivities.java

 package com.xxfc.platform.activity.entity;
 
-        import java.io.Serializable;
-        import java.math.BigInteger;
-        import java.util.Date;
-        import javax.persistence.*;
-        import io.swagger.annotations.ApiModelProperty;
-        import lombok.Data;
+import java.io.Serializable;
+import java.math.BigInteger;
+import javax.persistence.*;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 
 /**
  * 精彩活动
+ *
  * @author Administrator
  */
 @Data
@@ -18,7 +19,7 @@ public class HomeActivities implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     *  主键
+     * 主键
      */
     @Id
     @GeneratedValue(generator = "JDBC")
@@ -26,35 +27,35 @@ public class HomeActivities implements Serializable {
     private Integer id;
 
     /**
-     *  创建时间
+     * 创建时间
      */
     @Column(name = "crt_time")
-    @ApiModelProperty(value = "创建时间", hidden = true )
+    @ApiModelProperty(value = "创建时间", hidden = true)
     private BigInteger crtTime;
 
     /**
-     *  更新时间
+     * 更新时间
      */
     @Column(name = "upd_time")
-    @ApiModelProperty(value = "更新时间", hidden = true )
+    @ApiModelProperty(value = "更新时间", hidden = true)
     private BigInteger updTime;
 
     /**
-     *  活动名称
+     * 活动名称
      */
     @Column(name = "name")
     @ApiModelProperty(value = "精彩活动名称")
     private String name;
 
     /**
-     *  精彩活动开始时间
+     * 精彩活动开始时间
      */
     @Column(name = "start_time")
     @ApiModelProperty(value = "活动开始时间")
     private BigInteger startTime;
 
     /**
-     *  精彩活动结束时间
+     * 精彩活动结束时间
      */
     @Column(name = "end_time")
     @ApiModelProperty(value = "活动结束时间")
@@ -62,36 +63,48 @@ public class HomeActivities implements Serializable {
 
 
     /**
-     *  当前状态 1--显示在活动页 2--隐藏
+     * 当前状态 1--显示在活动页 2--隐藏
      */
     @Column(name = "status")
     @ApiModelProperty(value = "当前状态 1--显示在活动页 2--隐藏")
     private Integer status;
 
     /**
-     *  排序
+     * 排序
      */
     @Column(name = "sort")
     @ApiModelProperty(value = "排序")
     private Integer sort;
 
     /**
-     *  活动图片
+     * 活动图片
      */
     @Column(name = "picture")
     @ApiModelProperty(value = "活动图片")
     private String picture;
 
 
-
     /**
      * 活动页面链接
      */
     @Column(name = "url")
-    @ApiModelProperty(value = "活动页面链接")
+    @ApiModelProperty(value = "安卓链接")
     private String url;
 
 
+    /**
+     * 活动页面链接
+     */
+    @Column(name = "ios_url")
+    @ApiModelProperty(value = "苹果链接")
+    private String iosUrl;
+
+    /**
+     * 活动页面链接
+     */
+    @Column(name = "p_url")
+    @ApiModelProperty(value = "小程序链接")
+    private String purl;
 
     /**
      * 是否删除:0-否,1-是
@@ -105,6 +118,4 @@ public class HomeActivities implements Serializable {
      */
     @Column(name = "time_type")
     private Integer timeType;
-
-
 }

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

@@ -186,4 +186,8 @@ public class VehicleModel implements Serializable {
 	@Column(name = "app_show")
 	@ApiModelProperty("是否在App展示")
 	private Integer appShow;
+
+	@Column(name = "panorama_url")
+	@ApiModelProperty("全景vr链接")
+	private String panoramaUrl;
 }