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

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

 fanli/src/main/java/com/yeshi/fanli/entity/bus/activity/ActivityUser.java

@@ -39,6 +39,12 @@
   @Column(name = "au_create_time")

   private Date createTime;



   // 标签

   @Expose

   @Column(name = "au_tag")

   private String tag;

	


   public String getNickName() {

      return nickName;

   }

@@ -70,4 +76,12 @@
   public void setCreateTime(Date createTime) {

      this.createTime = createTime;

   }



   public String getTag() {

      return tag;

   }



   public void setTag(String tag) {

      this.tag = tag;

   }

}