Merge branch 'test_wangge_two' into 'test'

罗元桥

2021-06-23 2b322522e7b801377cdba46c66a1c4ae61f56be0

 springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/UserApi.java

@@ -80,9 +80,11 @@
        }
        if(StringUtils.isNotEmpty(userInfoAppDTO.getImagesUrl())){
            loginUserInfo.setImageUrl(userInfoAppDTO.getImagesUrl());
            loginUserInfo.setNickName(null);
        }
        if(StringUtils.isNotEmpty(userInfoAppDTO.getNickName())){
            loginUserInfo.setNickName(userInfoAppDTO.getNickName());
            loginUserInfo.setImageUrl(null);
        }
        return userService.putUser(loginUserInfo);
    }