Merge branch 'whole_new' of http://120.27.238.55:7000/r/exchange into whole...

Helius

2021-03-04 ea6dfba6e2550f75437398c790559b1eb98ba49d

 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