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

zainali5120

2020-10-25 bef3b23ca8918a355f6ff9751b46f4c35970f19e

 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