Merge branch 'master' into whole_new

Helius

2020-09-13 b98dd4349c26a6d282e6e19b4d31e8e1ef5b5f5e

 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;