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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/PreviewInfo.java

@@ -39,6 +39,9 @@
   @Indexed

   private Long uid;

   @Field

   private Long createUid;

   @Field

   @Indexed

   private PreviewEnum type; // 类型

   @Field

   private String content; // json内容

@@ -85,4 +88,12 @@
      this.updateTime = updateTime;

   }



   public Long getCreateUid() {

      return createUid;

   }



   public void setCreateUid(Long createUid) {

      this.createUid = createUid;

   }



}