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

Helius

2020-08-21 2bb8c9ae6db2668213d03d02cd8b38e6bc7aae83

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

@@ -26,11 +26,6 @@
    public static final Integer IS_SHOW_Y = 1;
    public static final Integer IS_SHOW_N = 2;


    /**
     * 主键ID
     */
    private Long id;
    /**
     * 会员ID
     */
@@ -43,7 +38,7 @@
    /**
     * 跟单订单ID
     */
    private Long tradeOrderId;
    private String tradeOrderNo;

    /**
     * 交易员用户ID