From b200b681bc401bb11c133a79273ba78cb6ebedf8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 30 七月 2021 18:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/UserApi.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/UserApi.java
index de3fc67..5dba79f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/UserApi.java
@@ -80,9 +80,12 @@
}
if(StringUtils.isNotEmpty(userInfoAppDTO.getImagesUrl())){
loginUserInfo.setImageUrl(userInfoAppDTO.getImagesUrl());
+ loginUserInfo.setNickName(null);
}
if(StringUtils.isNotEmpty(userInfoAppDTO.getNickName())){
loginUserInfo.setNickName(userInfoAppDTO.getNickName());
+ loginUserInfo.setName(userInfoAppDTO.getNickName());
+ loginUserInfo.setImageUrl(null);
}
return userService.putUser(loginUserInfo);
}
--
Gitblit v1.7.1