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

zainali5120

2021-02-25 9219e18a9b2fb06b95b5c881b057d3fde7270ca3

 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
     */
@@ -39,6 +34,17 @@
     * 交易员ID
     */
    private Long tradeId;

    /**
     * 跟单订单ID
     */
    private String tradeOrderNo;

    /**
     * 交易员用户ID
     */
    private Long tradeMemberId;

    /**
     * 订单ID
     */