diff --git a/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/AssemblyDataHelper.cs b/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/AssemblyDataHelper.cs
new file mode 100644
index 0000000000000000000000000000000000000000..bab823e99c24d66498ece65b1d023ddc4f06a73c
--- /dev/null
+++ b/Yi.Abp.Net8/framework/Yi.Framework.Core/Helper/AssemblyDataHelper.cs
@@ -0,0 +1,83 @@
+using System.Collections.Specialized;
+
+namespace Yi.Framework.Core.Helper;
+
+/// <summary>
+/// 数据装配帮助类
+/// </summary>
+public static class AssemblyDataHelper
+{
+    /// <summary>
+    /// 装配数据
+    /// </summary>
+    /// <param name="dataList">数据</param>
+    /// <param name="keyValues">装配键值，键为原始数据列，值为目标列</param>
+    /// <param name="dataDicFunc">装配的原始字典</param>
+    /// <typeparam name="T"></typeparam>
+    public static async Task AssemblyData<T>(List<T> dataList, NameValueCollection keyValues,
+        Func<HashSet<Guid>, Task<Dictionary<Guid, string>>> dataDicFunc)
+    {
+        HashSet<Guid> idList = [];
+        var t = typeof(T);
+        foreach (var data in dataList)
+        {
+            foreach (var m in keyValues.AllKeys)
+            {
+                var p = t.GetProperty(m);
+                if (p != null)
+                {
+                    var v = p.GetValue(data);
+                    if (v is Guid guid)
+                    {
+                        idList.Add(guid);
+                    }
+
+                    continue;
+                }
+
+                var f = t.GetField(m);
+                if (f != null)
+                {
+                    var v = f.GetValue(data);
+                    if (v is Guid g)
+                    {
+                        idList.Add(g);
+                    }
+                }
+            }
+        }
+
+        var userDic = await dataDicFunc.Invoke(idList);
+        foreach (var data in dataList)
+        {
+            foreach (var m in keyValues.AllKeys)
+            {
+                var p = t.GetProperty(m);
+                if (p != null)
+                {
+                    var v = p.GetValue(data);
+                    if (v is Guid guid)
+                    {
+                        var k = t.GetProperty(keyValues[m]);
+                        var val = userDic[guid];
+                        k.SetValue(data, val ?? v);
+                    }
+
+                    continue;
+                }
+
+                var f = t.GetField(m);
+                if (f != null)
+                {
+                    var v = f.GetValue(data);
+                    if (v is Guid guid1)
+                    {
+                        var k = t.GetField(keyValues[m]);
+                        var value = userDic[guid1];
+                        k.SetValue(data, value ?? v);
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application.Contracts/IBackUser.cs b/Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application.Contracts/IBackUser.cs
new file mode 100644
index 0000000000000000000000000000000000000000..a5d04497e28a9538020025b7873899c86e7fe8f9
--- /dev/null
+++ b/Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application.Contracts/IBackUser.cs
@@ -0,0 +1,16 @@
+using Volo.Abp.Auditing;
+
+namespace Yi.Framework.Ddd.Application.Contracts;
+
+public interface IBackUser : IAuditedObject
+{
+    /// <summary>
+    /// 创建的用户名
+    /// </summary>
+    public string CreateUserNikeName { get; set; }
+
+    /// <summary>
+    /// 更新的用户名
+    /// </summary>
+    public string UpdateUserNikeName { get; set; }
+}
\ No newline at end of file
diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/IServices/IUserService.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/IServices/IUserService.cs
index 343765e4ca4bb3715d5dcb832a7b68bb5e21a9ef..88691bec5147c89c28f169b9ad0a6b55c6431da5 100644
--- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/IServices/IUserService.cs
+++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application.Contracts/IServices/IUserService.cs
@@ -1,3 +1,4 @@
+using System.Collections.Specialized;
 using Yi.Framework.Ddd.Application.Contracts;
 using Yi.Framework.Rbac.Application.Contracts.Dtos.User;
 
@@ -8,5 +9,20 @@ namespace Yi.Framework.Rbac.Application.Contracts.IServices
     /// </summary>
     public interface IUserService : IYiCrudAppService<UserGetOutputDto, UserGetListOutputDto, Guid, UserGetListInputVo, UserCreateInputVo, UserUpdateInputVo>
     {
+        /// <summary>
+        /// 装配返回数据中的创建用户和修改用户
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="dataList">返回数据列表</param>
+        public Task AssemblyBackUser<T>(List<T> dataList) where T : class, IBackUser;
+
+        /// <summary>
+        /// 装配用户，用来处理没有实现IBackUser接口，但需要返回用户信息
+        /// 例如 AuditUserId列 对应 AuditUserNikeName这种
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="dataList"></param>
+        /// <param name="keyValues">key为原始id列，value为填充列</param>
+        public Task AssemblyBackUser<T>(List<T> dataList, NameValueCollection keyValues) where T : class;
     }
 }
diff --git a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/UserService.cs b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/UserService.cs
index 70597f3b071d759ce50072e2bba1aa9cd1ca29cd..e3b5308eb32b6b19369c2feb1228bd7044461b05 100644
--- a/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/UserService.cs
+++ b/Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/UserService.cs
@@ -1,3 +1,4 @@
+using System.Collections.Specialized;
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
 using TencentCloud.Tcr.V20190924.Models;
@@ -8,7 +9,9 @@ using Volo.Abp.EventBus.Local;
 using Volo.Abp.Users;
 using Yi.Framework.Bbs.Domain.Shared.Enums;
 using Yi.Framework.Bbs.Domain.Shared.Etos;
+using Yi.Framework.Core.Helper;
 using Yi.Framework.Ddd.Application;
+using Yi.Framework.Ddd.Application.Contracts;
 using Yi.Framework.Rbac.Application.Contracts.Dtos.User;
 using Yi.Framework.Rbac.Application.Contracts.IServices;
 using Yi.Framework.Rbac.Domain.Authorization;
@@ -237,5 +240,53 @@ namespace Yi.Framework.Rbac.Application.Services.System
         {
             return base.PostImportExcelAsync(input);
         }
+        
+        
+        [RemoteService(false)]
+        public async Task AssemblyBackUser<T>(List<T> dataList) where T : class, IBackUser
+        {
+            HashSet<Guid> useridList = [];
+            foreach (var data in dataList)
+            {
+                if (data.CreatorId != null) useridList.Add(data.CreatorId.Value);
+                if (data.LastModifierId != null) useridList.Add(data.LastModifierId.Value);
+            }
+
+            var userDic = await GetByNameKeyByIdListAsync(useridList);
+            foreach (var data in dataList)
+            {
+                if (data.CreatorId != null)
+                {
+                    data.CreateUserNikeName =
+                        userDic.ContainsKey(data.CreatorId.Value) ? userDic[data.CreatorId.Value] : "";
+                }
+
+                if (data.LastModifierId != null)
+                {
+                    data.UpdateUserNikeName = userDic.ContainsKey(data.LastModifierId.Value)
+                        ? userDic[data.LastModifierId.Value]
+                        : "";
+                }
+            }
+        }
+
+        [RemoteService(false)]
+        public async Task AssemblyBackUser<T>(List<T> dataList, NameValueCollection keyValues) where T : class
+        {
+            await AssemblyDataHelper.AssemblyData(dataList, keyValues, GetByNameKeyByIdListAsync);
+        }
+        
+        /// <summary>
+        /// 用id查询用户，装备配为字典，键为id，值为Nike
+        /// </summary>
+        /// <param name="idList">guid列表</param>
+        /// <returns></returns>
+        private async Task<Dictionary<Guid, string>> GetByNameKeyByIdListAsync(IEnumerable<Guid> idList)
+        {
+            var users = await _repository.GetListAsync(u => idList.Contains(u.Id));
+            Dictionary<Guid, string> userDic = new();
+            users.ForEach(x => userDic.Add(x.Id, x.Nick));
+            return userDic;
+        }
     }
 }
\ No newline at end of file
diff --git a/Yi.Pure.Vue3/eslint.config.js b/Yi.Pure.Vue3/eslint.config.js
index b4d48fbc6d2a31d829b8499eff822f9ce5b4a9a9..844b8bd6a039ae6416874a9d1e9d7d6fc2f0baff 100644
--- a/Yi.Pure.Vue3/eslint.config.js
+++ b/Yi.Pure.Vue3/eslint.config.js
@@ -8,174 +8,174 @@ import * as parserTypeScript from "@typescript-eslint/parser";
 import pluginTypeScript from "@typescript-eslint/eslint-plugin";
 
 export default defineFlatConfig([
-  {
-    ...js.configs.recommended,
-    ignores: [
-      "**/.*",
-      "dist/*",
-      "*.d.ts",
-      "public/*",
-      "src/assets/**",
-      "src/**/iconfont/**"
-    ],
-    languageOptions: {
-      globals: {
-        // index.d.ts
-        RefType: "readonly",
-        EmitType: "readonly",
-        TargetContext: "readonly",
-        ComponentRef: "readonly",
-        ElRef: "readonly",
-        ForDataType: "readonly",
-        AnyFunction: "readonly",
-        PropType: "readonly",
-        Writable: "readonly",
-        Nullable: "readonly",
-        NonNullable: "readonly",
-        Recordable: "readonly",
-        ReadonlyRecordable: "readonly",
-        Indexable: "readonly",
-        DeepPartial: "readonly",
-        Without: "readonly",
-        Exclusive: "readonly",
-        TimeoutHandle: "readonly",
-        IntervalHandle: "readonly",
-        Effect: "readonly",
-        ChangeEvent: "readonly",
-        WheelEvent: "readonly",
-        ImportMetaEnv: "readonly",
-        Fn: "readonly",
-        PromiseFn: "readonly",
-        ComponentElRef: "readonly",
-        parseInt: "readonly",
-        parseFloat: "readonly"
-      }
-    },
-    plugins: {
-      prettier: pluginPrettier
-    },
-    rules: {
-      ...configPrettier.rules,
-      ...pluginPrettier.configs.recommended.rules,
-      "no-debugger": "off",
-      "no-unused-vars": [
-        "error",
-        {
-          argsIgnorePattern: "^_",
-          varsIgnorePattern: "^_"
-        }
-      ],
-      "prettier/prettier": [
-        "error",
-        {
-          endOfLine: "auto"
-        }
-      ]
-    }
-  },
-  {
-    files: ["**/*.?([cm])ts", "**/*.?([cm])tsx"],
-    languageOptions: {
-      parser: parserTypeScript,
-      parserOptions: {
-        sourceType: "module"
-      }
-    },
-    plugins: {
-      "@typescript-eslint": pluginTypeScript
-    },
-    rules: {
-      ...pluginTypeScript.configs.strict.rules,
-      "@typescript-eslint/ban-types": "off",
-      "@typescript-eslint/no-redeclare": "error",
-      "@typescript-eslint/ban-ts-comment": "off",
-      "@typescript-eslint/no-explicit-any": "off",
-      "@typescript-eslint/prefer-as-const": "warn",
-      "@typescript-eslint/no-empty-function": "off",
-      "@typescript-eslint/no-non-null-assertion": "off",
-      "@typescript-eslint/no-import-type-side-effects": "error",
-      "@typescript-eslint/explicit-module-boundary-types": "off",
-      "@typescript-eslint/consistent-type-imports": [
-        "error",
-        { disallowTypeAnnotations: false, fixStyle: "inline-type-imports" }
-      ],
-      "@typescript-eslint/prefer-literal-enum-member": [
-        "error",
-        { allowBitwiseExpressions: true }
-      ],
-      "@typescript-eslint/no-unused-vars": [
-        "error",
-        {
-          argsIgnorePattern: "^_",
-          varsIgnorePattern: "^_"
-        }
-      ]
-    }
-  },
-  {
-    files: ["**/*.d.ts"],
-    rules: {
-      "eslint-comments/no-unlimited-disable": "off",
-      "import/no-duplicates": "off",
-      "unused-imports/no-unused-vars": "off"
-    }
-  },
-  {
-    files: ["**/*.?([cm])js"],
-    rules: {
-      "@typescript-eslint/no-require-imports": "off",
-      "@typescript-eslint/no-var-requires": "off"
-    }
-  },
-  {
-    files: ["**/*.vue"],
-    languageOptions: {
-      globals: {
-        $: "readonly",
-        $$: "readonly",
-        $computed: "readonly",
-        $customRef: "readonly",
-        $ref: "readonly",
-        $shallowRef: "readonly",
-        $toRef: "readonly"
-      },
-      parser: parserVue,
-      parserOptions: {
-        ecmaFeatures: {
-          jsx: true
-        },
-        extraFileExtensions: [".vue"],
-        parser: "@typescript-eslint/parser",
-        sourceType: "module"
-      }
-    },
-    plugins: {
-      vue: pluginVue
-    },
-    processor: pluginVue.processors[".vue"],
-    rules: {
-      ...pluginVue.configs.base.rules,
-      ...pluginVue.configs["vue3-essential"].rules,
-      ...pluginVue.configs["vue3-recommended"].rules,
-      "no-undef": "off",
-      "no-unused-vars": "off",
-      "vue/no-v-html": "off",
-      "vue/require-default-prop": "off",
-      "vue/require-explicit-emits": "off",
-      "vue/multi-word-component-names": "off",
-      "vue/no-setup-props-reactivity-loss": "off",
-      "vue/html-self-closing": [
-        "error",
-        {
-          html: {
-            void: "always",
-            normal: "always",
-            component: "always"
-          },
-          svg: "always",
-          math: "always"
-        }
-      ]
-    }
-  }
+  // {
+  //   ...js.configs.recommended,
+  //   ignores: [
+  //     "**/.*",
+  //     "dist/*",
+  //     "*.d.ts",
+  //     "public/*",
+  //     "src/assets/**",
+  //     "src/**/iconfont/**"
+  //   ],
+  //   languageOptions: {
+  //     globals: {
+  //       // index.d.ts
+  //       RefType: "readonly",
+  //       EmitType: "readonly",
+  //       TargetContext: "readonly",
+  //       ComponentRef: "readonly",
+  //       ElRef: "readonly",
+  //       ForDataType: "readonly",
+  //       AnyFunction: "readonly",
+  //       PropType: "readonly",
+  //       Writable: "readonly",
+  //       Nullable: "readonly",
+  //       NonNullable: "readonly",
+  //       Recordable: "readonly",
+  //       ReadonlyRecordable: "readonly",
+  //       Indexable: "readonly",
+  //       DeepPartial: "readonly",
+  //       Without: "readonly",
+  //       Exclusive: "readonly",
+  //       TimeoutHandle: "readonly",
+  //       IntervalHandle: "readonly",
+  //       Effect: "readonly",
+  //       ChangeEvent: "readonly",
+  //       WheelEvent: "readonly",
+  //       ImportMetaEnv: "readonly",
+  //       Fn: "readonly",
+  //       PromiseFn: "readonly",
+  //       ComponentElRef: "readonly",
+  //       parseInt: "readonly",
+  //       parseFloat: "readonly"
+  //     }
+  //   },
+  //   plugins: {
+  //     prettier: pluginPrettier
+  //   },
+  //   rules: {
+  //     ...configPrettier.rules,
+  //     ...pluginPrettier.configs.recommended.rules,
+  //     "no-debugger": "off",
+  //     "no-unused-vars": [
+  //       "error",
+  //       {
+  //         argsIgnorePattern: "^_",
+  //         varsIgnorePattern: "^_"
+  //       }
+  //     ],
+  //     "prettier/prettier": [
+  //       "error",
+  //       {
+  //         endOfLine: "auto"
+  //       }
+  //     ]
+  //   }
+  // },
+  // {
+  //   files: ["**/*.?([cm])ts", "**/*.?([cm])tsx"],
+  //   languageOptions: {
+  //     parser: parserTypeScript,
+  //     parserOptions: {
+  //       sourceType: "module"
+  //     }
+  //   },
+  //   plugins: {
+  //     "@typescript-eslint": pluginTypeScript
+  //   },
+  //   rules: {
+  //     ...pluginTypeScript.configs.strict.rules,
+  //     "@typescript-eslint/ban-types": "off",
+  //     "@typescript-eslint/no-redeclare": "error",
+  //     "@typescript-eslint/ban-ts-comment": "off",
+  //     "@typescript-eslint/no-explicit-any": "off",
+  //     "@typescript-eslint/prefer-as-const": "warn",
+  //     "@typescript-eslint/no-empty-function": "off",
+  //     "@typescript-eslint/no-non-null-assertion": "off",
+  //     "@typescript-eslint/no-import-type-side-effects": "error",
+  //     "@typescript-eslint/explicit-module-boundary-types": "off",
+  //     "@typescript-eslint/consistent-type-imports": [
+  //       "error",
+  //       { disallowTypeAnnotations: false, fixStyle: "inline-type-imports" }
+  //     ],
+  //     "@typescript-eslint/prefer-literal-enum-member": [
+  //       "error",
+  //       { allowBitwiseExpressions: true }
+  //     ],
+  //     "@typescript-eslint/no-unused-vars": [
+  //       "error",
+  //       {
+  //         argsIgnorePattern: "^_",
+  //         varsIgnorePattern: "^_"
+  //       }
+  //     ]
+  //   }
+  // },
+  // {
+  //   files: ["**/*.d.ts"],
+  //   rules: {
+  //     "eslint-comments/no-unlimited-disable": "off",
+  //     "import/no-duplicates": "off",
+  //     "unused-imports/no-unused-vars": "off"
+  //   }
+  // },
+  // {
+  //   files: ["**/*.?([cm])js"],
+  //   rules: {
+  //     "@typescript-eslint/no-require-imports": "off",
+  //     "@typescript-eslint/no-var-requires": "off"
+  //   }
+  // },
+  // {
+  //   files: ["**/*.vue"],
+  //   languageOptions: {
+  //     globals: {
+  //       $: "readonly",
+  //       $$: "readonly",
+  //       $computed: "readonly",
+  //       $customRef: "readonly",
+  //       $ref: "readonly",
+  //       $shallowRef: "readonly",
+  //       $toRef: "readonly"
+  //     },
+  //     parser: parserVue,
+  //     parserOptions: {
+  //       ecmaFeatures: {
+  //         jsx: true
+  //       },
+  //       extraFileExtensions: [".vue"],
+  //       parser: "@typescript-eslint/parser",
+  //       sourceType: "module"
+  //     }
+  //   },
+  //   plugins: {
+  //     vue: pluginVue
+  //   },
+  //   processor: pluginVue.processors[".vue"],
+  //   rules: {
+  //     ...pluginVue.configs.base.rules,
+  //     ...pluginVue.configs["vue3-essential"].rules,
+  //     ...pluginVue.configs["vue3-recommended"].rules,
+  //     "no-undef": "off",
+  //     "no-unused-vars": "off",
+  //     "vue/no-v-html": "off",
+  //     "vue/require-default-prop": "off",
+  //     "vue/require-explicit-emits": "off",
+  //     "vue/multi-word-component-names": "off",
+  //     "vue/no-setup-props-reactivity-loss": "off",
+  //     "vue/html-self-closing": [
+  //       "error",
+  //       {
+  //         html: {
+  //           void: "always",
+  //           normal: "always",
+  //           component: "always"
+  //         },
+  //         svg: "always",
+  //         math: "always"
+  //       }
+  //     ]
+  //   }
+  // }
 ]);
diff --git a/Yi.Pure.Vue3/src/api/account.ts b/Yi.Pure.Vue3/src/api/account.ts
index c3afcf621b31ad2d372d30e9fd9cbc7fbb9e0166..4fe8abbbdd41db94f8dc7f2f3688c65e6ac94a5d 100644
--- a/Yi.Pure.Vue3/src/api/account.ts
+++ b/Yi.Pure.Vue3/src/api/account.ts
@@ -18,6 +18,14 @@ export type LoginResult = {
   };
 };
 
+export type TenantResult = {
+  status: number;
+  data: Array<{
+    id: string;
+    name: string;
+  }>;
+};
+
 export type UserResult = {
   status: number;
   data: {
@@ -69,6 +77,11 @@ export const getCodeImg = () => {
   return http.request<imageCaptcha>("get", "/account/captcha-image");
 };
 
+/** 获取租户信息 */
+export const getTenant = () => {
+  return http.request<TenantResult>("get", "/tenant/select");
+}
+
 /** 刷新`token` */
 export const refreshTokenApi = (data?: object) => {
   return http.request<RefreshTokenResult>("post", "/refresh-token", { data });
diff --git a/Yi.Pure.Vue3/src/store/modules/user.ts b/Yi.Pure.Vue3/src/store/modules/user.ts
index e5f103797c51586759363f8b622b324d8f8128ed..1ba17c1e90dde2148455551194cf29c245f19a79 100644
--- a/Yi.Pure.Vue3/src/store/modules/user.ts
+++ b/Yi.Pure.Vue3/src/store/modules/user.ts
@@ -15,7 +15,7 @@ import {
   refreshTokenApi
 } from "@/api/account";
 import { useMultiTagsStoreHook } from "./multiTags";
-import { type DataInfo, setToken, removeToken, userKey } from "@/utils/auth";
+import {type DataInfo, setToken, removeToken, userKey, setTenantId, getTenantId} from "@/utils/auth";
 
 export const useUserStore = defineStore({
   id: "pure-user",
@@ -38,7 +38,9 @@ export const useUserStore = defineStore({
     // 是否勾选了登录页的免登录
     isRemembered: false,
     // 登录页的免登录存储几天，默认7天
-    loginDay: 7
+    loginDay: 7,
+    // 租户id
+    tenantId: getTenantId()
   }),
   actions: {
     /** 存储头像 */
@@ -78,8 +80,9 @@ export const useUserStore = defineStore({
       this.loginDay = Number(value);
     },
     /** 登入 */
-    async loginByUsername(data) {
+    async loginByUsername(data:any,tenantId:string) {
       return new Promise<UserResult>((resolve, reject) => {
+        setTenantId(tenantId);
         getLogin(data)
           .then(data => {
             if (data.status == 200) {
@@ -100,6 +103,7 @@ export const useUserStore = defineStore({
             }
           })
           .catch(error => {
+            this.tenantId=null;
             reject(error);
           });
       });
diff --git a/Yi.Pure.Vue3/src/store/types.ts b/Yi.Pure.Vue3/src/store/types.ts
index d6503d9c424bb1309e66e16e86ef458809627b0f..04b9892faae6ef4d79f0b991e88bb80fa5b8310b 100644
--- a/Yi.Pure.Vue3/src/store/types.ts
+++ b/Yi.Pure.Vue3/src/store/types.ts
@@ -47,4 +47,5 @@ export type userType = {
   currentPage?: number;
   isRemembered?: boolean;
   loginDay?: number;
+  tenantId?:string;
 };
diff --git a/Yi.Pure.Vue3/src/utils/auth.ts b/Yi.Pure.Vue3/src/utils/auth.ts
index a8a64a3e03286d577b6e21b6640d0ffbcdff9c50..2d036936ade3944d17d93d0072e875cc2eb24bca 100644
--- a/Yi.Pure.Vue3/src/utils/auth.ts
+++ b/Yi.Pure.Vue3/src/utils/auth.ts
@@ -23,6 +23,7 @@ export interface DataInfo<T> {
 
 export const userKey = "user-info";
 export const TokenKey = "authorized-token";
+export const TenantIdKey = 'Tenant-Id'
 /**
  * 通过`multiple-tabs`是否在`cookie`中，判断用户是否已经登录系统，
  * 从而支持多标签页打开已经登录的系统后无需再登录。
@@ -138,3 +139,25 @@ export const hasPerms = (value: string | Array<string>): boolean => {
     : isIncludeAllChildren(value, permissions);
   return isAuths ? true : false;
 };
+
+/**
+ * 获取租户id
+ */
+export function getTenantId() {
+  return Cookies.get(TenantIdKey)
+}
+
+/**
+ * 设置租户id
+ * @param tenantId 租户id
+ */
+export function setTenantId(tenantId: string) {
+  return Cookies.set(TenantIdKey, tenantId)
+}
+
+/**
+ * 删除租户id
+ */
+export function removeTenantId() {
+  return Cookies.remove(TenantIdKey)
+}
diff --git a/Yi.Pure.Vue3/src/views/login/index.vue b/Yi.Pure.Vue3/src/views/login/index.vue
index 7adcc70addb25281599a94f2c3408635673b7747..6b6cdb5281b13ed505387b0993afb7aec79a3370 100644
--- a/Yi.Pure.Vue3/src/views/login/index.vue
+++ b/Yi.Pure.Vue3/src/views/login/index.vue
@@ -1,29 +1,29 @@
 <script setup lang="ts">
-import { useI18n } from "vue-i18n";
+import {useI18n} from "vue-i18n";
 import Motion from "./utils/motion";
-import { useRouter } from "vue-router";
-import { message } from "@/utils/message";
-import { loginRules } from "./utils/rule";
+import {useRouter} from "vue-router";
+import {message} from "@/utils/message";
+import {loginRules} from "./utils/rule";
 import TypeIt from "@/components/ReTypeit";
-import { debounce } from "@pureadmin/utils";
-import { useNav } from "@/layout/hooks/useNav";
-import { useEventListener } from "@vueuse/core";
-import type { FormInstance } from "element-plus";
-import { $t, transformI18n } from "@/plugins/i18n";
-import { operates, thirdParty } from "./utils/enums";
-import { useLayout } from "@/layout/hooks/useLayout";
+import {debounce} from "@pureadmin/utils";
+import {useNav} from "@/layout/hooks/useNav";
+import {useEventListener} from "@vueuse/core";
+import type {FormInstance} from "element-plus";
+import {$t, transformI18n} from "@/plugins/i18n";
+import {operates, thirdParty} from "./utils/enums";
+import {useLayout} from "@/layout/hooks/useLayout";
 import LoginPhone from "./components/LoginPhone.vue";
 import LoginRegist from "./components/LoginRegist.vue";
 import LoginUpdate from "./components/LoginUpdate.vue";
 import LoginQrCode from "./components/LoginQrCode.vue";
-import { useUserStoreHook } from "@/store/modules/user";
-import { initRouter, getTopMenu } from "@/router/utils";
-import { bg, avatar, illustration } from "./utils/static";
-import { ref, toRaw, reactive, watch, computed } from "vue";
-import { useRenderIcon } from "@/components/ReIcon/src/hooks";
-import { useTranslationLang } from "@/layout/hooks/useTranslationLang";
-import { useDataThemeChange } from "@/layout/hooks/useDataThemeChange";
-import { getCodeImg } from "@/api/account";
+import {useUserStoreHook} from "@/store/modules/user";
+import {initRouter, getTopMenu} from "@/router/utils";
+import {bg, avatar, illustration} from "./utils/static";
+import {ref, toRaw, reactive, watch, computed} from "vue";
+import {useRenderIcon} from "@/components/ReIcon/src/hooks";
+import {useTranslationLang} from "@/layout/hooks/useTranslationLang";
+import {useDataThemeChange} from "@/layout/hooks/useDataThemeChange";
+import {getCodeImg, getTenant} from "@/api/account";
 
 import dayIcon from "@/assets/svg/day.svg?component";
 import darkIcon from "@/assets/svg/dark.svg?component";
@@ -44,18 +44,20 @@ const router = useRouter();
 const loading = ref(false);
 const checked = ref(false);
 const disabled = ref(false);
+const tenants = reactive([{name: "default", id: "default"}]);
+const currentTenant = ref("default");
 const ruleFormRef = ref<FormInstance>();
 const currentPage = computed(() => {
   return useUserStoreHook().currentPage;
 });
 
-const { t } = useI18n();
-const { initStorage } = useLayout();
+const {t} = useI18n();
+const {initStorage} = useLayout();
 initStorage();
-const { dataTheme, overallStyle, dataThemeChange } = useDataThemeChange();
+const {dataTheme, overallStyle, dataThemeChange} = useDataThemeChange();
 dataThemeChange(overallStyle.value);
-const { title, getDropdownItemStyle, getDropdownItemClass } = useNav();
-const { locale, translationCh, translationEn } = useTranslationLang();
+const {title, getDropdownItemStyle, getDropdownItemClass} = useNav();
+const {locale, translationCh, translationEn} = useTranslationLang();
 
 const ruleForm = reactive({
   username: "",
@@ -72,53 +74,61 @@ const getCode = () => {
   });
 };
 
+const initTenant = () => {
+  getTenant().then(res => {
+    if (res.data) {
+      tenants.push(...res.data)
+    }
+  })
+}
+
 const onLogin = async (formEl: FormInstance | undefined) => {
   if (!formEl) return;
   await formEl.validate(valid => {
     if (valid) {
       loading.value = true;
       useUserStoreHook()
-        .loginByUsername({
-          username: ruleForm.username,
-          password: ruleForm.password,
-          uuid: ruleForm.uuid,
-          code: ruleForm.verifyCode
-        })
-        .then(res => {
-          if (res.status == 200) {
-            // 获取后端路由
-            return initRouter().then(() => {
-              disabled.value = true;
-              router
-                .push(getTopMenu(true).path)
-                .then(() => {
-                  message(t("login.pureLoginSuccess"), { type: "success" });
-                })
-                .finally(() => (disabled.value = false));
-            });
-          } else {
-            message(t("login.pureLoginFail"), { type: "error" });
-          }
-        })
-        .catch(() => {
-          getCode();
-        })
-        .finally(() => (loading.value = false));
+          .loginByUsername({
+            username: ruleForm.username,
+            password: ruleForm.password,
+            uuid: ruleForm.uuid,
+            code: ruleForm.verifyCode
+          }, currentTenant.value == "default" ? "" : currentTenant.value)
+          .then(res => {
+            if (res.status == 200) {
+              // 获取后端路由
+              return initRouter().then(() => {
+                disabled.value = true;
+                router
+                    .push(getTopMenu(true).path)
+                    .then(() => {
+                      message(t("login.pureLoginSuccess"), {type: "success"});
+                    })
+                    .finally(() => (disabled.value = false));
+              });
+            } else {
+              message(t("login.pureLoginFail"), {type: "error"});
+            }
+          })
+          .catch(() => {
+            getCode();
+          })
+          .finally(() => (loading.value = false));
     }
   });
 };
 
 const immediateDebounce: any = debounce(
-  formRef => onLogin(formRef),
-  1000,
-  true
+    formRef => onLogin(formRef),
+    1000,
+    true
 );
 
-useEventListener(document, "keypress", ({ code }) => {
+useEventListener(document, "keypress", ({code}) => {
   if (
-    ["Enter", "NumpadEnter"].includes(code) &&
-    !disabled.value &&
-    !loading.value
+      ["Enter", "NumpadEnter"].includes(code) &&
+      !disabled.value &&
+      !loading.value
   )
     immediateDebounce(ruleFormRef.value);
 });
@@ -132,47 +142,48 @@ watch(checked, bool => {
 watch(loginDay, value => {
   useUserStoreHook().SET_LOGINDAY(value);
 });
+initTenant();
 getCode();
 </script>
 
 <template>
   <div class="select-none">
-    <img :src="bg" class="wave" alt="" />
+    <img :src="bg" class="wave" alt=""/>
     <div class="flex-c absolute right-5 top-3">
       <!-- 主题 -->
       <el-switch
-        v-model="dataTheme"
-        inline-prompt
-        :active-icon="dayIcon"
-        :inactive-icon="darkIcon"
-        @change="dataThemeChange"
+          v-model="dataTheme"
+          inline-prompt
+          :active-icon="dayIcon"
+          :inactive-icon="darkIcon"
+          @change="dataThemeChange"
       />
       <!-- 国际化 -->
       <el-dropdown trigger="click">
         <globalization
-          class="hover:text-primary hover:!bg-[transparent] w-[20px] h-[20px] ml-1.5 cursor-pointer outline-none duration-300"
+            class="hover:text-primary hover:!bg-[transparent] w-[20px] h-[20px] ml-1.5 cursor-pointer outline-none duration-300"
         />
         <template #dropdown>
           <el-dropdown-menu class="translation">
             <el-dropdown-item
-              :style="getDropdownItemStyle(locale, 'zh')"
-              :class="['dark:!text-white', getDropdownItemClass(locale, 'zh')]"
-              @click="translationCh"
+                :style="getDropdownItemStyle(locale, 'zh')"
+                :class="['dark:!text-white', getDropdownItemClass(locale, 'zh')]"
+                @click="translationCh"
             >
               <IconifyIconOffline
-                v-show="locale === 'zh'"
-                class="check-zh"
-                :icon="Check"
+                  v-show="locale === 'zh'"
+                  class="check-zh"
+                  :icon="Check"
               />
               简体中文
             </el-dropdown-item>
             <el-dropdown-item
-              :style="getDropdownItemStyle(locale, 'en')"
-              :class="['dark:!text-white', getDropdownItemClass(locale, 'en')]"
-              @click="translationEn"
+                :style="getDropdownItemStyle(locale, 'en')"
+                :class="['dark:!text-white', getDropdownItemClass(locale, 'en')]"
+                @click="translationEn"
             >
               <span v-show="locale === 'en'" class="check-en">
-                <IconifyIconOffline :icon="Check" />
+                <IconifyIconOffline :icon="Check"/>
               </span>
               English
             </el-dropdown-item>
@@ -182,42 +193,42 @@ getCode();
     </div>
     <div class="login-container">
       <div class="img">
-        <component :is="toRaw(illustration)" />
+        <component :is="toRaw(illustration)"/>
       </div>
       <div class="login-box">
         <div class="login-form">
-          <avatar class="avatar" />
+          <avatar class="avatar"/>
           <Motion>
             <h2 class="outline-none">
               <TypeIt
-                :options="{ strings: [title], cursor: false, speed: 100 }"
+                  :options="{ strings: [title], cursor: false, speed: 100 }"
               />
             </h2>
           </Motion>
 
           <el-form
-            v-if="currentPage === 0"
-            ref="ruleFormRef"
-            :model="ruleForm"
-            :rules="loginRules"
-            size="large"
+              v-if="currentPage === 0"
+              ref="ruleFormRef"
+              :model="ruleForm"
+              :rules="loginRules"
+              size="large"
           >
             <Motion :delay="100">
               <el-form-item
-                :rules="[
+                  :rules="[
                   {
                     required: true,
                     message: transformI18n($t('login.pureUsernameReg')),
                     trigger: 'blur'
                   }
                 ]"
-                prop="username"
+                  prop="username"
               >
                 <el-input
-                  v-model="ruleForm.username"
-                  clearable
-                  :placeholder="t('login.pureUsername')"
-                  :prefix-icon="useRenderIcon(User)"
+                    v-model="ruleForm.username"
+                    clearable
+                    :placeholder="t('login.pureUsername')"
+                    :prefix-icon="useRenderIcon(User)"
                 />
               </el-form-item>
             </Motion>
@@ -225,11 +236,11 @@ getCode();
             <Motion :delay="150">
               <el-form-item prop="password">
                 <el-input
-                  v-model="ruleForm.password"
-                  clearable
-                  show-password
-                  :placeholder="t('login.purePassword')"
-                  :prefix-icon="useRenderIcon(Lock)"
+                    v-model="ruleForm.password"
+                    clearable
+                    show-password
+                    :placeholder="t('login.purePassword')"
+                    :prefix-icon="useRenderIcon(Lock)"
                 />
               </el-form-item>
             </Motion>
@@ -237,34 +248,52 @@ getCode();
             <Motion :delay="200">
               <el-form-item prop="verifyCode">
                 <el-input
-                  v-model="ruleForm.verifyCode"
-                  clearable
-                  :placeholder="t('login.pureVerifyCode')"
-                  :prefix-icon="useRenderIcon('ri:shield-keyhole-line')"
+                    v-model="ruleForm.verifyCode"
+                    clearable
+                    :placeholder="t('login.pureVerifyCode')"
+                    :prefix-icon="useRenderIcon('ri:shield-keyhole-line')"
                 >
                   <template v-slot:append>
                     <img
-                      :src="codeUrl"
-                      width="120"
-                      height="40"
-                      style="width: 120px; height: 40px; max-width: none"
-                      class="cursor-pointer"
-                      alt=""
-                      @click="getCode"
+                        :src="codeUrl"
+                        width="120"
+                        height="40"
+                        style="width: 120px; height: 40px; max-width: none"
+                        class="cursor-pointer"
+                        alt=""
+                        @click="getCode"
                     />
                   </template>
                 </el-input>
               </el-form-item>
             </Motion>
 
+            <Motion :delay="150" v-if="tenants.length>1">
+              <el-form-item prop="password">
+                <el-select
+                    v-model="currentTenant"
+                    clearable
+                    show-password
+                >
+                  <el-option
+                      v-for="item in tenants"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </Motion>
+
             <Motion :delay="250">
               <el-form-item>
                 <div class="w-full h-[20px] flex justify-between items-center">
                   <el-checkbox v-model="checked">
                     <span class="flex">
                       <select
-                        v-model="loginDay"
-                        :style="{
+                          v-model="loginDay"
+                          :style="{
                           width: loginDay < 10 ? '10px' : '16px',
                           outline: 'none',
                           background: 'none',
@@ -277,30 +306,30 @@ getCode();
                       </select>
                       {{ t("login.pureRemember") }}
                       <IconifyIconOffline
-                        v-tippy="{
+                          v-tippy="{
                           content: t('login.pureRememberInfo'),
                           placement: 'top'
                         }"
-                        :icon="Info"
-                        class="ml-1"
+                          :icon="Info"
+                          class="ml-1"
                       />
                     </span>
                   </el-checkbox>
                   <el-button
-                    link
-                    type="primary"
-                    @click="useUserStoreHook().SET_CURRENTPAGE(4)"
+                      link
+                      type="primary"
+                      @click="useUserStoreHook().SET_CURRENTPAGE(4)"
                   >
                     {{ t("login.pureForget") }}
                   </el-button>
                 </div>
                 <el-button
-                  class="w-full mt-4"
-                  size="default"
-                  type="primary"
-                  :loading="loading"
-                  :disabled="disabled"
-                  @click="onLogin(ruleFormRef)"
+                    class="w-full mt-4"
+                    size="default"
+                    type="primary"
+                    :loading="loading"
+                    :disabled="disabled"
+                    @click="onLogin(ruleFormRef)"
                 >
                   {{ t("login.pureLogin") }}
                 </el-button>
@@ -311,11 +340,11 @@ getCode();
               <el-form-item>
                 <div class="w-full h-[20px] flex justify-between items-center">
                   <el-button
-                    v-for="(item, index) in operates"
-                    :key="index"
-                    class="w-full mt-4"
-                    size="default"
-                    @click="useUserStoreHook().SET_CURRENTPAGE(index + 1)"
+                      v-for="(item, index) in operates"
+                      :key="index"
+                      class="w-full mt-4"
+                      size="default"
+                      @click="useUserStoreHook().SET_CURRENTPAGE(index + 1)"
                   >
                     {{ t(item.title) }}
                   </el-button>
@@ -333,38 +362,37 @@ getCode();
               </el-divider>
               <div class="w-full flex justify-evenly">
                 <span
-                  v-for="(item, index) in thirdParty"
-                  :key="index"
-                  :title="t(item.title)"
+                    v-for="(item, index) in thirdParty"
+                    :key="index"
+                    :title="t(item.title)"
                 >
                   <IconifyIconOnline
-                    :icon="`ri:${item.icon}-fill`"
-                    width="20"
-                    class="cursor-pointer text-gray-500 hover:text-blue-400"
+                      :icon="`ri:${item.icon}-fill`"
+                      width="20"
+                      class="cursor-pointer text-gray-500 hover:text-blue-400"
                   />
                 </span>
               </div>
             </el-form-item>
           </Motion>
           <!-- 手机号登录 -->
-          <LoginPhone v-if="currentPage === 1" />
+          <LoginPhone v-if="currentPage === 1"/>
           <!-- 二维码登录 -->
-          <LoginQrCode v-if="currentPage === 2" />
+          <LoginQrCode v-if="currentPage === 2"/>
           <!-- 注册 -->
-          <LoginRegist v-if="currentPage === 3" />
+          <LoginRegist v-if="currentPage === 3"/>
           <!-- 忘记密码 -->
-          <LoginUpdate v-if="currentPage === 4" />
+          <LoginUpdate v-if="currentPage === 4"/>
         </div>
       </div>
     </div>
     <div
-      class="w-full flex-c absolute bottom-3 text-sm text-[rgba(0,0,0,0.6)] dark:text-[rgba(220,220,242,0.8)]"
+        class="w-full flex-c absolute bottom-3 text-sm text-[rgba(0,0,0,0.6)] dark:text-[rgba(220,220,242,0.8)]"
     >
       Copyright © 2020-present
-      <a
-        class="hover:text-primary"
-        href="https://github.com/pure-admin"
-        target="_blank"
+      <a class="hover:text-primary"
+         href="https://github.com/pure-admin"
+         target="_blank"
       >
         &nbsp;{{ title }}
       </a>
diff --git a/Yi.Pure.Vue3/src/views/permission/page/index.vue b/Yi.Pure.Vue3/src/views/permission/page/index.vue
index 5d50b2e0dccd253d0b28a450ca2836cddeed6c42..8e6a01f2da187a73972d9759f902c575c81bbd36 100644
--- a/Yi.Pure.Vue3/src/views/permission/page/index.vue
+++ b/Yi.Pure.Vue3/src/views/permission/page/index.vue
@@ -1,9 +1,10 @@
 <script setup lang="ts">
-import { initRouter } from "@/router/utils";
-import { storageLocal } from "@pureadmin/utils";
-import { type CSSProperties, ref, computed } from "vue";
-import { useUserStoreHook } from "@/store/modules/user";
-import { usePermissionStoreHook } from "@/store/modules/permission";
+import {initRouter} from "@/router/utils";
+import {storageLocal} from "@pureadmin/utils";
+import {type CSSProperties, ref, computed} from "vue";
+import {useUserStoreHook} from "@/store/modules/user";
+import {usePermissionStoreHook} from "@/store/modules/permission";
+import {getTenantId} from "@/utils/auth";
 
 defineOptions({
   name: "PermissionPage"
@@ -31,14 +32,17 @@ const options = [
 
 function onChange() {
   useUserStoreHook()
-    .loginByUsername({ username: username.value, password: "admin123" })
-    .then(res => {
-      if (res.status == 200) {
-        storageLocal().removeItem("async-routes");
-        usePermissionStoreHook().clearAllCachePage();
-        initRouter();
-      }
-    });
+      .loginByUsername(
+          {username: username.value, password: "admin123"},
+          getTenantId()
+      )
+      .then(res => {
+        if (res.status == 200) {
+          storageLocal().removeItem("async-routes");
+          usePermissionStoreHook().clearAllCachePage();
+          initRouter();
+        }
+      });
 }
 </script>
 
@@ -53,19 +57,19 @@ function onChange() {
           <span>当前角色：{{ username }}</span>
         </div>
         <el-link
-          class="mt-2"
-          href="https://github.com/pure-admin/vue-pure-admin/blob/main/src/views/permission/page/index.vue"
-          target="_blank"
+            class="mt-2"
+            href="https://github.com/pure-admin/vue-pure-admin/blob/main/src/views/permission/page/index.vue"
+            target="_blank"
         >
           代码位置 src/views/permission/page/index.vue
         </el-link>
       </template>
       <el-select v-model="username" class="!w-[160px]" @change="onChange">
         <el-option
-          v-for="item in options"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
         />
       </el-select>
     </el-card>