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

zainali5120

2021-02-25 9219e18a9b2fb06b95b5c881b057d3fde7270ca3

 src/main/java/com/xcong/excoin/modules/documentary/entity/FollowTraderInfoEntity.java

@@ -20,7 +20,6 @@
    */

   private static final long serialVersionUID = 1L;

   

   public static final String AVATAR_DEFAULT = "测试图片地址";

   public static final String DECLARATION_DEFAULT = "正忙着赚钱，什么也没写";

    /**

     * 会员ID

@@ -39,6 +38,10 @@
     */

    private String declaration;

    /**

     * 标签

     */

    private String labels;

    /**

     * 是否满员 1-是2-否

     */

    private Integer isAll;