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

xiaoyong931011

2021-03-03 1c4fc74b0963c154a5d5b827389dc9169392331b

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

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

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