Merge branches 'cpv' and 'feature/撮合交易' of https://gitee.com/chonggaoxiao/n...

zainali5120

2020-10-13 17fb78903b310564aaeea6e4fd50824f45d4677a

 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;