Merge remote-tracking branch 'origin/master'

admin

2019-05-15 3be3f6e670d2e11d7ced76b8202f0ef30b56870f

 fanli/src/main/java/com/yeshi/fanli/entity/dynamic/DynamicInfo.java

@@ -70,6 +70,10 @@
   @Expose

   @Field("createTime")

   private Date createTime;

	
   // 更新时间

   @Field("updateTime")

   private Date updateTime;



   // 所属类型 1热销 2好货 3好店 4邀请

   @Field("classId")

@@ -208,4 +212,12 @@
      this.activityId = activityId;

   }



   public Date getUpdateTime() {

      return updateTime;

   }



   public void setUpdateTime(Date updateTime) {

      this.updateTime = updateTime;

   }



}