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

zainali5120

2021-03-14 0f4df6c351d87054ded6bd54f0c6b9f6253ea56f

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

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

    /**
     * 交易员用户ID