From 6d95ff17f7d0de0b3efafe033ba1e3b4487d4f2e Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期二, 05 八月 2025 09:14:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
index 765e16c..24799c6 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
@@ -534,11 +534,12 @@
     @Override
     public Result updateMemberNickName(MemberNickNameForm form) {
         Member member = baseMapper.selectById(form.getMemberId());
-        if ("寰俊鐢ㄦ埛".equals(member.getNickName()) || StringUtils.isEmpty(member.getNickName())) {
+        if ("寰俊鐢ㄦ埛".equals(member.getNickName()) || StringUtils.isBlank(member.getNickName())) {
             member.setNickName(form.getNickName());
             baseMapper.updateById(member);
+            return Result.ok().data(member.getNickName());
         }
-        return Result.ok("淇敼鎴愬姛");
+        return Result.ok().data(member.getNickName());
     }
 
     @Override

--
Gitblit v1.8.0