Merge remote-tracking branch 'origin/activity' into activity

zainali5120

2021-05-12 2720d8d8e2ea1a03e6dd42809d75f788349f66c8

 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