Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity

Helius

2021-03-30 2cdf732d4130b227514d2c0ba1e40e6c1cece54a

 src/main/java/com/xcong/excoin/modules/member/entity/AgentReturnEntity.java

@@ -29,6 +29,16 @@
     */
    public static final int ORDER_TYPE_HOLD = 3;

    /**
     * 是否已返佣 0-否
     */
    public static final int IS_RETURN_N = 0;

    /**
     * 是否已返佣 1-是
     */
    public static final int IS_RETURN_Y = 1;

    private Long memberId;

    private Long orderId;