Merge branch 'master-new-activity' into dev

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

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import javax.persistence.*;
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 
 /**
@@ -84,9 +85,27 @@ public class ActivityPopularizeLog implements Serializable {
 	@ApiModelProperty(value = "状态 0--未完成；1--完成；-1--失败")
 	private Integer status;
 
+	/**
+	 * 昵称
+	 */
 	@Transient
 	private String nickname;
 
+	/**
+	 * 头像
+	 */
 	@Transient
 	private String headimgurl;
+
+	/**
+	 * 邀请的第几个用户
+	 */
+	@Transient
+	private Integer num;
+
+	/**
+	 * 邀请的第几个用户的奖金
+	 */
+	@Transient
+	private BigDecimal amount;
 }