Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity

xiaoyong931011

2021-04-06 87c7037e167ba94e858c4ae7a1d1870c4128b775

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

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

    /**
     * 指纹解锁功能  1：是   0:否
     */
    private Integer fingerprintState;
    
    /**
     * 是否可平仓   1：否   0：是
     */
    private Integer pcState;
    
    public static final Integer PCSTATE_Y = 0;
    
    public static final Integer PCSTATE_N = 1;
}