From 6c2e9ba62c418185361179e7014862c481f34e17 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 09 Mar 2022 14:22:09 +0800
Subject: [PATCH] conflect merge
---
src/main/java/com/xcong/excoin/common/system/bean/LoginUserBean.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/common/system/bean/LoginUserBean.java b/src/main/java/com/xcong/excoin/common/system/bean/LoginUserBean.java
index a2e10cf..0924317 100644
--- a/src/main/java/com/xcong/excoin/common/system/bean/LoginUserBean.java
+++ b/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
--
Gitblit v1.9.1