Merge remote-tracking branch 'origin/master'

admin

2019-05-22 9b4bf99c1a30f3a7c2bdd6faba7589ff4f7e48e5

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

@@ -91,6 +91,18 @@
   @Field("activityId")

   private Long activityId;



   // 邀请素材id

   @Field("inviteMaterialId")

   private String inviteMaterialId;





   public String getInviteMaterialId() {

      return inviteMaterialId;

   }



   public void setInviteMaterialId(String inviteMaterialId) {

      this.inviteMaterialId = inviteMaterialId;

   }



   public DynamicInfo() {

   }