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/MemberEntity.java

@@ -159,4 +159,9 @@
     * 平仓点数
     */
    private BigDecimal closingSpread;

    /**
     * 强平系数
     */
    private BigDecimal forceParam;
}