Merge remote-tracking branch 'origin/develop' into develop

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/TenantInfoController.java

@@ -270,15 +270,19 @@ public class TenantInfoController extends BaseController {
 
             // 修改用户基础信息流程
             //设置默认头像
+            com.yonge.cooleshow.biz.dal.entity.SysUser updateSysUser = new com.yonge.cooleshow.biz.dal.entity.SysUser();
+            updateSysUser.setId(user.getId());
+            // 用户昵称
+            if (StringUtils.isNotBlank(sysUser.getUsername())) {
+                updateSysUser.setUsername(sysUser.getUsername());
+            }
+            //设置默认头像
             if (StringUtils.isNotBlank(sysUser.getAvatar())) {
                 //sysUser.setAvatar(sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD));
-
-                // 更新用户头象
-                com.yonge.cooleshow.biz.dal.entity.SysUser updateSysUser = new com.yonge.cooleshow.biz.dal.entity.SysUser();
-                updateSysUser.setId(user.getId());
                 updateSysUser.setAvatar(sysUser.getAvatar());
-                sysUserMapper.updateById(updateSysUser);
             }
+            updateSysUser.setUpdateTime(LocalDateTime.now());
+            sysUserMapper.updateById(updateSysUser);
 
             // 更新机构员工头像和昵称，机构信息表中的用户昵称
             tenantStaffService.lambdaUpdate()

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/TenantInfoController.java

@@ -270,16 +270,20 @@ public class TenantInfoController extends BaseController {
         } else {
 
             // 修改用户基础信息流程
+            // 更新用户头象
+            com.yonge.cooleshow.biz.dal.entity.SysUser updateSysUser = new com.yonge.cooleshow.biz.dal.entity.SysUser();
+            updateSysUser.setId(user.getId());
+            // 用户昵称
+            if (StringUtils.isNotBlank(sysUser.getUsername())) {
+                updateSysUser.setUsername(sysUser.getUsername());
+            }
             //设置默认头像
             if (StringUtils.isNotBlank(sysUser.getAvatar())) {
                 //sysUser.setAvatar(sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD));
-
-                // 更新用户头象
-                com.yonge.cooleshow.biz.dal.entity.SysUser updateSysUser = new com.yonge.cooleshow.biz.dal.entity.SysUser();
-                updateSysUser.setId(user.getId());
                 updateSysUser.setAvatar(sysUser.getAvatar());
-                sysUserMapper.updateById(updateSysUser);
             }
+            updateSysUser.setUpdateTime(LocalDateTime.now());
+            sysUserMapper.updateById(updateSysUser);
 
             // 更新机构员工头像和昵称，机构信息表中的用户昵称
             tenantStaffService.lambdaUpdate()