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

xiaoyong931011

2021-04-06 bf68aa759bc3c0a858d80cb3d1ae1f1682cd6c94

 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