Merge remote-tracking branch 'origin/feature/0721-tenant' into feature/0721-tenant

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

@@ -228,7 +228,10 @@ public class TenantInfoController extends BaseController {
                 // 创建和修改时间
                 newSysUser.setCreateTime(LocalDateTime.now());
                 newSysUser.setUpdateTime(LocalDateTime.now());
-                newSysUser.setAvatar(sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD));
+                if (StringUtils.isBlank(newSysUser.getAvatar())) {
+                    // 使用默认用户头像
+                    newSysUser.setAvatar(sysConfigService.findConfigValue(SysConfigConstant.DEFAULT_HEARD));
+                }
                 // 锁定状态
                 newSysUser.setLockFlag(0);
                 // 用户类型