Merge branches 'cpv' and 'feature/撮合交易' of https://gitee.com/chonggaoxiao/n...

zainali5120

2020-11-15 47b56397ce10d4927ccc303539c103cf5d5dbe30

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

@@ -150,6 +150,11 @@
     */
    private Integer isForce;
    
    /**
     *  shifou xianzhi
     */
    private Integer isTrader;

    /**
     * 滑点
     */