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

zainali5120

2021-04-28 ffca7fc095a9111837dfd82288faef450b749f69

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

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

    /**
     * 交易员用户ID