diff --git a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
index 459c32e..654c085 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java
@@ -789,11 +789,12 @@ public class MainController extends BaseController {
     company.setShortName(tenantName);
     company.setTenantId(tenant.getTenantId());
     company.setTemplateId(user.getTemplateId());
-    tenantService.initialization(company);
+    final Company addCompany = tenantService.initialization(company);
     final UserParam userParam = new UserParam();
     userParam.setIsAdmin(true);
     userParam.setPhone(phone);
     userParam.setTemplateId(user.getTemplateId());
+    userParam.setTenantId(addCompany.getTenantId());  // 使用新创建的租户ID
     final User adminByPhone = userService.getAdminByPhone(userParam);
 
     // 设置过期时间
@@ -973,6 +974,7 @@ public class MainController extends BaseController {
       userParam1.setIsAdmin(true);
       userParam1.setPhone(phone);
       userParam1.setTemplateId(user.getTemplateId());
+      userParam1.setTenantId(addCompany.getTenantId());  // 使用新创建的租户ID
       final User adminByPhone = userService.getAdminByPhone(userParam1);
 
       // 设置过期时间
diff --git a/src/main/java/com/gxwebsoft/common/system/entity/Tenant.java b/src/main/java/com/gxwebsoft/common/system/entity/Tenant.java
index e3d3849..3ba8201 100644
--- a/src/main/java/com/gxwebsoft/common/system/entity/Tenant.java
+++ b/src/main/java/com/gxwebsoft/common/system/entity/Tenant.java
@@ -96,6 +96,10 @@ public class Tenant implements Serializable {
   @TableField(exist = false)
   private Object date;
 
+  @Schema(description = "用户名")
+  @TableField(exist = false)
+  private String username;
+
   @Schema(description = "手机号码")
   @TableField(exist = false)
   private String phone;
diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/TenantMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/TenantMapper.xml
index df9d363..8391424 100644
--- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/TenantMapper.xml
+++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/TenantMapper.xml
@@ -4,7 +4,7 @@
 
     <!-- 关联查询sql -->
     <sql id="selectSql">
-        SELECT a.*,b.company_name,b.company_logo as logo,b.admin_url,b.domain,b.free_domain,c.phone
+        SELECT a.*,b.company_name,b.company_logo as logo,b.admin_url,b.domain,b.free_domain,c.phone,c.username
         FROM sys_tenant a
         LEFT JOIN sys_company b ON a.tenant_id = b.tenant_id
         LEFT JOIN sys_user c ON a.user_id = c.user_id
diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java
index ba23291..1a8abae 100644
--- a/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java
@@ -105,7 +105,7 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, Tenant> impleme
 
       // 添加超级管理员
       User superAdmin = new User();
-      superAdmin.setUsername("superAdmin");
+      superAdmin.setUsername(CommonUtil.randomUUID16());  // 使用随机用户名
       superAdmin.setNickname(company.getShortName());
       superAdmin.setPhone(company.getPhone());
       superAdmin.setEmail(company.getEmail());