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

Helius

2020-08-21 2bb8c9ae6db2668213d03d02cd8b38e6bc7aae83

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

@@ -173,4 +173,9 @@
     * 强平系数
     */
    private BigDecimal forceParam;

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