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

xiaoyong931011

2021-03-26 98e3ca12ee10d7e304b61797f2cbe37fda629a25

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

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