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

zainali5120

2020-11-15 47b56397ce10d4927ccc303539c103cf5d5dbe30

 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