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

xiaoyong931011

2021-03-25 facab577702e7c34182ce8fb13faf03f74363d93

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

@@ -185,7 +185,11 @@
    private Integer fingerprintState;
    
    /**
     * 是否可平仓   1：是   0：否
     * 是否可平仓   1：否   0：是
     */
    private Integer pcState;
    
    public static final Integer PCSTATE_Y = 0;
    
    public static final Integer PCSTATE_N = 1;
}