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

Helius

2020-08-14 8de9b17d1070f3e0cd2094e0385035fe0c1ef535

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

@@ -38,7 +38,7 @@
    /**
     * 跟单订单ID
     */
    private Long tradeOrderId;
    private String tradeOrderNo;

    /**
     * 交易员用户ID