Merge remote-tracking branch 'origin/master'

yujian

2019-05-20 0a51e12c7a0a4ce201d5ba8459d702d029beea19

 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() {

   }