Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin into ...

Helius

2021-02-05 a2db1a0d4f90fdab5e39d3d13a9cc7a4774356df

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

@@ -117,7 +117,7 @@
    /**
     * 账号状态 0-禁用 1-启用
     */
    private int accountStatus;
    private Integer accountStatus;

    /**
     * 上级推荐人id
@@ -173,4 +173,9 @@
     * 强平系数
     */
    private BigDecimal forceParam;

    /**
     * 合约仓位类型
     */
    private Integer contractPositionType;
}