Merge branch 'master-new-activity' into dev

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

 package com.xxfc.platform.activity.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-import javax.persistence.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.*;
+import java.io.Serializable;
+
 
 /**
  * 用户参与推广活动（邀请有礼）的活动记录的记录（日志）
@@ -84,4 +84,9 @@ public class ActivityPopularizeLog implements Serializable {
 	@ApiModelProperty(value = "状态 0--未完成；1--完成；-1--失败")
 	private Integer status;
 
+	@Transient
+	private String nickname;
+
+	@Transient
+	private String headimgurl;
 }