Merge branch 'master_activity' into base-modify

xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/entity/Activity.java

@@ -80,6 +80,11 @@ public class Activity {
     @ApiModelProperty("活动场地（地址格式）")
     private String address;
 
+    @Column(name = "address_img")
+    @ApiModelProperty("地址图片")
+    private String addressImg;
+
+
     @Column(name = "latitude")
     @ApiModelProperty("纬度（不展示")
     private BigDecimal latitude;
@@ -88,9 +93,6 @@ public class Activity {
     @ApiModelProperty("经度 （不展示）")
     private BigDecimal longitude;
 
-    @Column(name = "content")
-    @ApiModelProperty("活动图文内容")
-    private String content;
 
     @Column(name = "is_show")
     @ApiModelProperty("活动开关（1开，0关）")
@@ -108,10 +110,22 @@ public class Activity {
     @ApiModelProperty("0-默认；1-报名中，2-进行中；3-已结束")
     private Integer status;
 
+    @Column(name = "content")
+    @ApiModelProperty("活动图文内容（峰会主题）")
+    private String content;
+
     @Column(name = "act_desc")
-    @ApiModelProperty("活动对象说明（不展示）")
+    @ApiModelProperty("活动对象说明（诚邀莅临）")
     private String actDesc;
 
+    @Column(name = "company_desc")
+    @ApiModelProperty("公司简章")
+    private String companyDesc;
+
+    @Column(name = "vehicle_imgs")
+    @ApiModelProperty("房车介绍")
+    private String vehicleImgs;
+
     @Column(name = "process_json")
     @ApiModelProperty("活动流程")
     private String processJson;