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

zainali5120

2021-02-25 9219e18a9b2fb06b95b5c881b057d3fde7270ca3

 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;
}