Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin into ...

Helius

2021-02-05 a2db1a0d4f90fdab5e39d3d13a9cc7a4774356df

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

@@ -23,11 +23,6 @@
     */
    public static final Integer FOLLOW_TYPE_RATE = 2;


    /**
     * 主键ID
     */
    private Long id;
    /**
     * 会员ID
     */
@@ -35,11 +30,11 @@
    /**
     * 交易员ID
     */
    private Long tradeId;
    private Long traderId;
    /**
     * 交易员会员ID
     */
    private Long tradeMemberId;
    private Long traderMemberId;
    /**
     * 跟单合约(多个，且逗号隔开)
     */