Merge remote-tracking branch 'origin/div' into div

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

 fanli/src/main/java/com/yeshi/fanli/entity/integral/CodePublishRecord.java

@@ -18,6 +18,9 @@
public class CodePublishRecord implements Serializable {



   private static final long serialVersionUID = 1L;

	
   // 发布有效时间 3天

   public static final long VALIDTIME  = 3*24*60*60;



   @Expose

   @Column(name = "pr_id")

@@ -37,7 +40,7 @@
   private String portrait; // 图片



   @Expose

   private String team; // 邀请码

   private Long team; // 邀请码



   @Expose

   private String inviteCode; // 邀请码

@@ -82,11 +85,11 @@
      this.portrait = portrait;

   }



   public String getTeam() {

   public Long getTeam() {

      return team;

   }



   public void setTeam(String team) {

   public void setTeam(Long team) {

      this.team = team;

   }