Merge branch 'whole_new' of http://120.27.238.55:7000/r/exchange into whole...

xiaoyong931011

2021-03-04 6bfa9de6c86de3b6de5d59e0dc9eebbba13bdb1f

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

@@ -178,4 +178,9 @@
     * 合约仓位类型
     */
    private Integer contractPositionType;

    /**
     * 指纹解锁功能  1：是   0:否
     */
    private Integer fingerprintState;
}