Merge branch 'master_activity' into dev

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

@@ -110,6 +110,11 @@ public class Activity {
     @ApiModelProperty("0-默认；1-报名中，2-进行中；3-已结束")
     private Integer status;
 
+
+    @Column(name = "live_url")
+    @ApiModelProperty("直播地址")
+    private String liveUrl;
+
     @Column(name = "content")
     @ApiModelProperty("活动图文内容（峰会主题）")
     private String content;