Merge branches 'cpv' and 'feature/撮合交易' of https://gitee.com/chonggaoxiao/n...

zainali5120

2020-10-12 43385a77303aa2295d902b5a2be9e28723d08cef

 src/main/java/com/xcong/excoin/common/system/bean/LoginUserBean.java

@@ -32,7 +32,7 @@
    @JsonIgnore
    @Override
    public String getUsername() {
        return memberEntity.getUsername();
        return "";
    }

    @JsonIgnore