Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-07-16 452e76ef26d9cab2c873763ae9422133890df0fa

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

@@ -84,6 +84,7 @@
        }
        if(StringUtils.isNotEmpty(userInfoAppDTO.getNickName())){
            loginUserInfo.setNickName(userInfoAppDTO.getNickName());
            loginUserInfo.setName(userInfoAppDTO.getNickName());
            loginUserInfo.setImageUrl(null);
        }
        return userService.putUser(loginUserInfo);