Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin.git

xiaoyong931011

2020-05-25 caa90edd0fcd0e4f4e920bcc744eef12fee82ae6

 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