😎1、修复系统配置租户信息丢失问题 2、增加url中租户id标识参数缓存 3、代码整理

Admin.NET/Admin.NET.Application/Configuration/Alipay.json

@@ -19,7 +19,6 @@
         "EncryptKey": "xxxxxxxxxxxxxxxxxxxx",
         "AppCertPath": "Alipaycrt/appPublicCert.crt", // 应用公钥证书存放路径
         "AlipayPublicCertPath": "Alipaycrt/alipayPublicCert.crt" // 支付宝公钥证书存放路径
-
       },
       {
         "Name": "sandbox 默认应用2",

Admin.NET/Admin.NET.Core/Entity/SysAlipayAuthInfo.cs

@@ -9,8 +9,8 @@ namespace Admin.NET.Core;
 /// <summary>
 /// 支付宝授权记录表
 /// </summary>
-[SysTable]
 [SugarTable(null, "支付宝授权记录表")]
+[SysTable]
 [SugarIndex("index_{table}_U", nameof(UserId), OrderByType.Asc)]
 [SugarIndex("index_{table}_T", nameof(OpenId), OrderByType.Asc)]
 public class SysAlipayAuthInfo : EntityBase

Admin.NET/Admin.NET.Core/Entity/SysAlipayTransaction.cs

@@ -9,8 +9,8 @@ namespace Admin.NET.Core;
 /// <summary>
 /// 支付宝交易记录表
 /// </summary>
-[SysTable]
 [SugarTable(null, "支付宝交易记录表")]
+[SysTable]
 [SugarIndex("index_{table}_U", nameof(UserId), OrderByType.Asc)]
 [SugarIndex("index_{table}_T", nameof(TradeNo), OrderByType.Asc)]
 [SugarIndex("index_{table}_O", nameof(OutTradeNo), OrderByType.Asc)]

Admin.NET/Admin.NET.Core/Entity/SysCodeGenConfig.cs

@@ -136,6 +136,7 @@ public partial class SysCodeGenConfig : EntityBase
     [SugarColumn(ColumnDescription = "是否是统计字段", Length = 8)]
     [MaxLength(8)]
     public string? Statistical { get; set; }
+
     /// <summary>
     /// 是否是查询条件
     /// </summary>

Admin.NET/Admin.NET.Core/Entity/SysTenantCarousel.cs

@@ -1,8 +1,8 @@
-//// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
+// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
-////
+//
-//// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
+// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
-////
+//
-//// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
+// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
 
 //namespace Admin.NET.Core;
 

Admin.NET/Admin.NET.Core/Extension/StringExtension.cs

@@ -97,6 +97,7 @@ public static class StringExtension
 
         return char.ToLower(input[0]) + input[1..];
     }
+
     /// <summary>
     /// 转首字母大写
     /// </summary>
@@ -107,6 +108,7 @@ public static class StringExtension
 
         return char.ToUpper(input[0]) + input[1..];
     }
+
     /// <summary>
     /// 渲染字符串，替换占位符
     /// </summary>

Admin.NET/Admin.NET.Core/Service/Alipay/Dto/AlipayInput.cs

@@ -4,9 +4,9 @@
 //
 // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
 
-using System.Text.Json.Serialization;
 using Aop.Api.Domain;
 using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Admin.NET.Core.Service;
 

Admin.NET/Admin.NET.Core/Service/Alipay/SysAlipayService.cs

@@ -85,7 +85,7 @@ public class SysAlipayService : IDynamicApiController, ITransient
         // 记录授权信息
         var entity = _db.Queryable<SysAlipayAuthInfo>().First(u =>
             (!string.IsNullOrWhiteSpace(u.UserId) && u.UserId == info.UserId) ||
-            (!string.IsNullOrWhiteSpace(u.OpenId) && u.OpenId == info.OpenId)) ?? new ();
+            (!string.IsNullOrWhiteSpace(u.OpenId) && u.OpenId == info.OpenId)) ?? new();
         entity.Copy(info, excludes: [nameof(SysAlipayAuthInfo.Gender), nameof(SysAlipayAuthInfo.Age)]);
         entity.Age = int.Parse(info.Age);
         entity.Gender = info.Gender switch

Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenConfigService.cs

@@ -4,8 +4,6 @@
 //
 // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
 
-using System.Management.Automation.Language;
-
 namespace Admin.NET.Core.Service;
 
 /// <summary>
@@ -38,6 +36,7 @@ public class SysCodeGenConfigService : IDynamicApiController, ITransient
     {
         return GetColumnList(input.TableName, input.ConfigId);
     }
+
     /// <summary>
     /// 获取数据表列（实体属性）集合
     /// </summary>
@@ -47,18 +46,16 @@ public class SysCodeGenConfigService : IDynamicApiController, ITransient
     public List<ColumnOuput> GetColumnList(string EntityName, string ConfigId)
     {
         var entityType = GetEntityInfos().GetAwaiter().GetResult().FirstOrDefault(u => u.EntityName == EntityName);
+        if (entityType == null) return null;
 
-        if (entityType == null)
-            return null;
         var config = _dbConnectionOptions.ConnectionConfigs.FirstOrDefault(u => u.ConfigId.ToString() == ConfigId);
         var dbTableName = config!.DbSettings.EnableUnderLine ? UtilMethods.ToUnderLine(entityType.DbTableName) : entityType.DbTableName;
-
         int bracketIndex = dbTableName.IndexOf('{');
         if (bracketIndex != -1)
         {
-            dbTableName = dbTableName.Substring(0, bracketIndex);
+            dbTableName = dbTableName[..bracketIndex];
             var dbTableInfos = _db.AsTenant().GetConnectionScope(ConfigId).DbMaintenance.GetTableInfoList(false);
-            var table = dbTableInfos.FirstOrDefault(x => x.Name.StartsWith(config.DbSettings.EnableUnderLine ? UtilMethods.ToUnderLine(dbTableName) : dbTableName, StringComparison.CurrentCultureIgnoreCase));
+            var table = dbTableInfos.FirstOrDefault(u => u.Name.StartsWith(config.DbSettings.EnableUnderLine ? UtilMethods.ToUnderLine(dbTableName) : dbTableName, StringComparison.CurrentCultureIgnoreCase));
             if (table != null)
                 dbTableName = table.Name;
         }
@@ -85,7 +82,6 @@ public class SysCodeGenConfigService : IDynamicApiController, ITransient
 
         // 获取实体的属性信息，赋值给PropertyName属性(CodeFirst模式应以PropertyName为实际使用名称)
         var entityProperties = entityType.Type.GetProperties();
-
         for (int i = result.Count - 1; i >= 0; i--)
         {
             var columnOutput = result[i];
@@ -149,7 +145,6 @@ public class SysCodeGenConfigService : IDynamicApiController, ITransient
 
             var des = ct.GetCustomAttributes(typeof(DescriptionAttribute), false);
             var description = des.Length > 0 ? ((DescriptionAttribute)des[0]).Description : "";
-
             var sugarAttribute = ct.GetCustomAttributes(sugarTableType, true).FirstOrDefault();
 
             entityInfos.Add(new EntityInfo()
@@ -162,37 +157,34 @@ public class SysCodeGenConfigService : IDynamicApiController, ITransient
         }
         return await Task.FromResult(entityInfos);
     }
+
     /// <summary>
     /// 获取代码生成配置列表 🔖
     /// </summary>
     /// <param name="input"></param>
-    /// <param name="EntityName"></param>
-    /// <param name="ConfigId"></param>
     /// <returns></returns>
     [DisplayName("获取代码生成配置列表")]
     public async Task<List<CodeGenConfig>> GetList([FromQuery] CodeGenConfig input)
     {
-        //获取主表
+        // 获取主表
-        var CodeGen = _db.Queryable<SysCodeGen>().Single(it => it.Id == input.CodeGenId); //根据ID查询
+        var codeGenTable = _db.Queryable<SysCodeGen>().Single(u => u.Id == input.CodeGenId);
-        //先获取已经存储的配置字段
+        // 获取配置的字段
-        var list = await _db.Queryable<SysCodeGenConfig>()
+        var genConfigColumnList = await _db.Queryable<SysCodeGenConfig>().Where(u => u.CodeGenId == input.CodeGenId).ToListAsync();
-            .Where(u => u.CodeGenId == input.CodeGenId).ToListAsync();
+        // 获取实体所有字段
-
+        var tableColumnList = GetColumnList(codeGenTable.TableName, codeGenTable.ConfigId);
-        //找出实体字段
+        // 获取新增的字段
-        var ColumnList = GetColumnList(CodeGen.TableName, CodeGen.ConfigId);
+        var addColumnList = tableColumnList.Where(u => !genConfigColumnList.Select(d => d.ColumnName).Contains(u.ColumnName)).ToList();
-        //找出新增的字段
+        // 获取删除的字段
-        var addColumnList = ColumnList.Where(t => !list.Select(d => d.ColumnName).Contains(t.ColumnName)).ToList();
+        var delColumnList = genConfigColumnList.Where(u => !tableColumnList.Select(d => d.ColumnName).Contains(u.ColumnName)).ToList();
-        //找出已经删除的字段
+        // 获取更新的字段
-        var delColumnList = list.Where(t => !ColumnList.Select(d => d.ColumnName).Contains(t.ColumnName)).ToList();
+        var updateColumnList = new List<SysCodeGenConfig>();
-        //找出更新的
+        foreach (var column in genConfigColumnList)
-        var updateColumnList =new   List<SysCodeGenConfig>();
-        foreach (var column in list)
         {
-            //找出没有增减的
+            // 获取没有增减的
-            if (ColumnList.Any(it => it.ColumnName == column.ColumnName))
+            if (tableColumnList.Any(u => u.ColumnName == column.ColumnName))
             {
-                var nmd = ColumnList.Single(it => it.ColumnName == column.ColumnName);
+                var nmd = tableColumnList.Single(u => u.ColumnName == column.ColumnName);
-                //如果数据库类型或者长度改变
+                // 如果数据库类型或者长度改变
                 if (nmd.NetType != column.NetType || nmd.ColumnLength != column.ColumnLength || nmd.ColumnComment != column.ColumnComment)
                 {
                     column.NetType = nmd.NetType;
@@ -202,13 +194,13 @@ public class SysCodeGenConfigService : IDynamicApiController, ITransient
                 }
             }
         }
-        //增加新增
+        // 增加新增的
-        if(addColumnList.Count>0) AddList(addColumnList, CodeGen);
+        if (addColumnList.Count > 0) AddList(addColumnList, codeGenTable);
-        //删除没有的
+        // 删除没有的
-        if (delColumnList.Count > 0)  await _db.Deleteable(delColumnList).ExecuteCommandAsync();
+        if (delColumnList.Count > 0) await _db.Deleteable(delColumnList).ExecuteCommandAsync();
-        //更新
+        // 更新配置
         if (updateColumnList.Count > 0) await _db.Updateable(updateColumnList).ExecuteCommandAsync();
-        //重新获取
+        // 重新获取配置
         return await _db.Queryable<SysCodeGenConfig>()
             .Where(u => u.CodeGenId == input.CodeGenId)
             .Select<CodeGenConfig>()
@@ -230,6 +222,7 @@ public class SysCodeGenConfigService : IDynamicApiController, ITransient
     public async Task UpdateCodeGenConfig(List<CodeGenConfig> inputList)
     {
         if (inputList == null || inputList.Count < 1) return;
+
         await _db.Updateable(inputList.Adapt<List<SysCodeGenConfig>>())
             .IgnoreColumns(u => new { u.ColumnLength, u.ColumnName, u.PropertyName })
             .ExecuteCommandAsync();

Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs

@@ -293,15 +293,13 @@ public class SysCodeGenService : IDynamicApiController, ITransient
         if (Directory.Exists(outputPath)) Directory.Delete(outputPath, true);
 
         var tableFieldList = await _codeGenConfigService.GetList(new CodeGenConfig { CodeGenId = input.Id }); // 字段集合
-
         ProcessTableFieldList(tableFieldList); // 处理字段集合
 
         var queryWhetherList = tableFieldList.Where(u => u.QueryWhether == YesNoEnum.Y.ToString()).ToList(); // 前端查询集合
         var joinTableList = tableFieldList.Where(u => u.EffectType is "Upload" or "ForeignKey" or "ApiTreeSelector").ToList(); // 需要连表查询的字段
-
         var data = CreateCustomViewEngine(input, tableFieldList, queryWhetherList, joinTableList); // 创建视图引擎数据
 
-        // 获得菜单
+        // 获取菜单
         var menuList = await GetMenus(input.TableName!, input.BusName!, input.MenuPid ?? 0, input.MenuIcon!, input.PagePath!, tableFieldList);
         if (input.GenerateMenu)
         {
@@ -314,14 +312,12 @@ public class SysCodeGenService : IDynamicApiController, ITransient
         for (var i = 0; i < templateList.Count; i++)
         {
             string tResult = await ProcessTemplate(templateList[i], input, templatePath, data, menuList); // 处理模板
-
             string targetFile = templateList[i].OutputFile
                 .Replace("{PagePath}", input.PagePath)
                 .Replace("{TableName}", input.TableName)
                 .Replace("{TableNameLower}", input.TableName?.ToFirstLetterLowerCase() ?? "");
 
             string tmpPath;
-            
             if (!input.GenerateType.StartsWith('1'))
             {
                 if (templateList[i].Type == CodeGenTypeEnum.Frontend)
@@ -334,7 +330,6 @@ public class SysCodeGenService : IDynamicApiController, ITransient
                 tmpPath = templateList[i].Type == CodeGenTypeEnum.Frontend ? Path.Combine(outputPath, _codeGenOptions.FrontRootPath, "src") : Path.Combine(outputPath, input!.NameSpace!);
             }
             targetFile = Path.Combine(tmpPath, targetFile);
-
             var dirPath = new DirectoryInfo(targetFile).Parent!.FullName;
             if (!Directory.Exists(dirPath))
                 Directory.CreateDirectory(dirPath);
@@ -358,12 +353,10 @@ public class SysCodeGenService : IDynamicApiController, ITransient
     public async Task<Dictionary<string, string>> Preview(SysCodeGen input)
     {
         var tableFieldList = await _codeGenConfigService.GetList(new CodeGenConfig { CodeGenId = input.Id }); // 字段集合
-
         ProcessTableFieldList(tableFieldList); // 处理字段集合
 
         var queryWhetherList = tableFieldList.Where(u => u.QueryWhether == YesNoEnum.Y.ToString()).ToList(); // 前端查询集合
         var joinTableList = tableFieldList.Where(u => u.EffectType is "Upload" or "ForeignKey" or "ApiTreeSelector").ToList(); // 需要连表查询的字段
-
         var data = CreateCustomViewEngine(input, tableFieldList, queryWhetherList, joinTableList); // 创建视图引擎数据
 
         // 获取模板文件并替换
@@ -373,8 +366,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
         await _db.Ado.BeginTranAsync();
         try
         {
-            var menuList = await GetMenus(input.TableName!, input.BusName!, input.MenuPid ?? 0, input.MenuIcon!,
+            var menuList = await GetMenus(input.TableName!, input.BusName!, input.MenuPid ?? 0, input.MenuIcon!, input.PagePath!, tableFieldList);
-                input.PagePath!, tableFieldList);
             var result = new Dictionary<string, string>();
             foreach (var template in templateList)
             {
@@ -401,18 +393,16 @@ public class SysCodeGenService : IDynamicApiController, ITransient
             if (!string.IsNullOrWhiteSpace(item.Rules))
             {
                 if (item.Rules != "[]")
-                {
                     list = JSON.Deserialize<List<VerifyRuleItem>>(item.Rules);
-                }
             }
             else
             {
                 item.Rules = "[]";
             }
             item.RuleItems = list;
-            item.WhetherRequired = list.Any(t => t.Type == "required") ? YesNoEnum.Y.ToString() : YesNoEnum.N.ToString();
+            item.WhetherRequired = list.Any(u => u.Type == "required") ? YesNoEnum.Y.ToString() : YesNoEnum.N.ToString();
             item.AnyRule = list.Count > 0;
-            item.RemoteVerify = list.Any(t => t.Type == "remote");
+            item.RemoteVerify = list.Any(u => u.Type == "remote");
         }
     }
 

Admin.NET/Admin.NET.Core/Service/DataBase/SysDatabaseService.cs

@@ -4,9 +4,9 @@
 //
 // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
 
+using Admin.NET.Core;
 using Newtonsoft.Json.Converters;
 using Npgsql;
-using Admin.NET.Core;
 
 namespace Admin.NET.Core.Service;
 
@@ -296,6 +296,7 @@ public class SysDatabaseService : IDynamicApiController, ITransient
         input.BaseClassName = string.IsNullOrWhiteSpace(BaseClassName) ? "EntityBaseId" : BaseClassName;
         return GenerateEntity(input);
     }
+
     /// <summary>
     /// 创建实体文件内容
     /// </summary>

Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs

@@ -81,6 +81,7 @@ public class SysTenantService : IDynamicApiController, ITransient
                 RealName = a.RealName,
                 Phone = a.Phone,
                 Email = a.Email,
+                Host = u.Host,
                 ExpirationTime = u.ExpirationTime,
                 TenantType = u.TenantType,
                 DbType = u.DbType,
@@ -651,6 +652,24 @@ public class SysTenantService : IDynamicApiController, ITransient
             tenant.Logo = $"/{path}/{fileName}";
         }
 
-        await _sysTenantRep.AsUpdateable(tenant).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
+        await _sysTenantRep.AsUpdateable(tenant)
+            .UpdateColumns(u => new
+            {
+                u.Logo,
+                u.Title,
+                u.ViceTitle,
+                u.ViceDesc,
+                u.Copyright,
+                u.Icp,
+                u.IcpUrl,
+                u.Watermark,
+                u.Version,
+                u.ThemeColor,
+                u.Layout,
+                u.Animation,
+                u.Captcha,
+                u.SecondVer
+            })
+            .ExecuteCommandAsync();
     }
 }

Web/package.json

@@ -2,7 +2,7 @@
 	"name": "admin.net.pro",
 	"type": "module",
 	"version": "2.4.33",
-	"lastBuildTime": "2025.01.21",
+	"lastBuildTime": "2025.01.22",
 	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
 	"author": "zuohuaijun",
 	"license": "MIT",
@@ -74,7 +74,7 @@
 		"vue-router": "^4.5.0",
 		"vue-signature-pad": "^3.0.2",
 		"vue3-tree-org": "^4.2.2",
-		"vxe-pc-ui": "^4.3.76",
+		"vxe-pc-ui": "^4.3.77",
 		"vxe-table": "^4.10.0",
 		"vxe-table-plugin-element": "^4.0.4",
 		"vxe-table-plugin-export-xlsx": "^4.0.7",
@@ -103,7 +103,7 @@
 		"sass": "^1.83.4",
 		"terser": "^5.37.0",
 		"typescript": "^5.7.3",
-		"vite": "^6.0.10",
+		"vite": "^6.0.11",
 		"vite-plugin-cdn-import": "^1.0.1",
 		"vite-plugin-compression2": "^1.3.3",
 		"vite-plugin-vue-setup-extend": "^0.4.0",

Web/src/api-services/api.ts

@@ -12,7 +12,7 @@
  * Do not edit the class manually.
  */
 export * from './apis/apijsonapi';
-export * from './apis/alipay-api';
+export * from './apis/sys-alipay-api';
 export * from './apis/sys-auth-api';
 export * from './apis/sys-cache-api';
 export * from './apis/sys-code-gen-api';

Web/src/api-services/apis/sys-alipay-api.ts

@@ -21,10 +21,10 @@ import { AdminNETResultString } from '../models';
 import { AlipayPreCreateInput } from '../models';
 import { AlipayTradePagePayInput } from '../models';
 /**
- * AlipayApi - axios parameter creator
+ * SysAlipayApi - axios parameter creator
  * @export
  */
-export const AlipayApiAxiosParamCreator = function (configuration?: Configuration) {
+export const SysAlipayApiAxiosParamCreator = function (configuration?: Configuration) {
     return {
         /**
          * 
@@ -33,8 +33,8 @@ export const AlipayApiAxiosParamCreator = function (configuration?: Configuratio
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiAlipayAlipayPreCreatePost: async (body?: AlipayPreCreateInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        apiSysAlipayAlipayPreCreatePost: async (body?: AlipayPreCreateInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/alipay/alipayPreCreate`;
+            const localVarPath = `/api/sysAlipay/alipayPreCreate`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -81,8 +81,8 @@ export const AlipayApiAxiosParamCreator = function (configuration?: Configuratio
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiAlipayAlipayTradePagePayPost: async (body?: AlipayTradePagePayInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        apiSysAlipayAlipayTradePagePayPost: async (body?: AlipayTradePagePayInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/alipay/alipayTradePagePay`;
+            const localVarPath = `/api/sysAlipay/alipayTradePagePay`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -130,8 +130,8 @@ export const AlipayApiAxiosParamCreator = function (configuration?: Configuratio
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiAlipayGetAuthInfoGet: async (userId?: string, authCode?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        apiSysAlipayAuthInfoGet: async (userId?: string, authCode?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/alipay/getAuthInfo`;
+            const localVarPath = `/api/sysAlipay/authInfo`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -152,11 +152,11 @@ export const AlipayApiAxiosParamCreator = function (configuration?: Configuratio
             }
 
             if (userId !== undefined) {
-                localVarQueryParameter['UserId'] = userId;
+                localVarQueryParameter['user_id'] = userId;
             }
 
             if (authCode !== undefined) {
-                localVarQueryParameter['AuthCode'] = authCode;
+                localVarQueryParameter['auth_code'] = authCode;
             }
 
             const query = new URLSearchParams(localVarUrlObj.search);
@@ -181,8 +181,8 @@ export const AlipayApiAxiosParamCreator = function (configuration?: Configuratio
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiAlipayNotifyPost: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        apiSysAlipayNotifyPost: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/api/alipay/notify`;
+            const localVarPath = `/api/sysAlipay/notify`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             let baseOptions;
@@ -222,10 +222,10 @@ export const AlipayApiAxiosParamCreator = function (configuration?: Configuratio
 };
 
 /**
- * AlipayApi - functional programming interface
+ * SysAlipayApi - functional programming interface
  * @export
  */
-export const AlipayApiFp = function(configuration?: Configuration) {
+export const SysAlipayApiFp = function(configuration?: Configuration) {
     return {
         /**
          * 
@@ -234,8 +234,8 @@ export const AlipayApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiAlipayAlipayPreCreatePost(body?: AlipayPreCreateInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminNETResultString>>> {
+        async apiSysAlipayAlipayPreCreatePost(body?: AlipayPreCreateInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminNETResultString>>> {
-            const localVarAxiosArgs = await AlipayApiAxiosParamCreator(configuration).apiAlipayAlipayPreCreatePost(body, options);
+            const localVarAxiosArgs = await SysAlipayApiAxiosParamCreator(configuration).apiSysAlipayAlipayPreCreatePost(body, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -248,8 +248,8 @@ export const AlipayApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiAlipayAlipayTradePagePayPost(body?: AlipayTradePagePayInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminNETResultString>>> {
+        async apiSysAlipayAlipayTradePagePayPost(body?: AlipayTradePagePayInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminNETResultString>>> {
-            const localVarAxiosArgs = await AlipayApiAxiosParamCreator(configuration).apiAlipayAlipayTradePagePayPost(body, options);
+            const localVarAxiosArgs = await SysAlipayApiAxiosParamCreator(configuration).apiSysAlipayAlipayTradePagePayPost(body, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -263,8 +263,8 @@ export const AlipayApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiAlipayGetAuthInfoGet(userId?: string, authCode?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
+        async apiSysAlipayAuthInfoGet(userId?: string, authCode?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
-            const localVarAxiosArgs = await AlipayApiAxiosParamCreator(configuration).apiAlipayGetAuthInfoGet(userId, authCode, options);
+            const localVarAxiosArgs = await SysAlipayApiAxiosParamCreator(configuration).apiSysAlipayAuthInfoGet(userId, authCode, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -276,8 +276,8 @@ export const AlipayApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiAlipayNotifyPost(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminNETResultString>>> {
+        async apiSysAlipayNotifyPost(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminNETResultString>>> {
-            const localVarAxiosArgs = await AlipayApiAxiosParamCreator(configuration).apiAlipayNotifyPost(options);
+            const localVarAxiosArgs = await SysAlipayApiAxiosParamCreator(configuration).apiSysAlipayNotifyPost(options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -287,10 +287,10 @@ export const AlipayApiFp = function(configuration?: Configuration) {
 };
 
 /**
- * AlipayApi - factory interface
+ * SysAlipayApi - factory interface
  * @export
  */
-export const AlipayApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
+export const SysAlipayApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
     return {
         /**
          * 
@@ -299,8 +299,8 @@ export const AlipayApiFactory = function (configuration?: Configuration, basePat
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiAlipayAlipayPreCreatePost(body?: AlipayPreCreateInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminNETResultString>> {
+        async apiSysAlipayAlipayPreCreatePost(body?: AlipayPreCreateInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminNETResultString>> {
-            return AlipayApiFp(configuration).apiAlipayAlipayPreCreatePost(body, options).then((request) => request(axios, basePath));
+            return SysAlipayApiFp(configuration).apiSysAlipayAlipayPreCreatePost(body, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -309,8 +309,8 @@ export const AlipayApiFactory = function (configuration?: Configuration, basePat
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiAlipayAlipayTradePagePayPost(body?: AlipayTradePagePayInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminNETResultString>> {
+        async apiSysAlipayAlipayTradePagePayPost(body?: AlipayTradePagePayInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminNETResultString>> {
-            return AlipayApiFp(configuration).apiAlipayAlipayTradePagePayPost(body, options).then((request) => request(axios, basePath));
+            return SysAlipayApiFp(configuration).apiSysAlipayAlipayTradePagePayPost(body, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -320,8 +320,8 @@ export const AlipayApiFactory = function (configuration?: Configuration, basePat
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiAlipayGetAuthInfoGet(userId?: string, authCode?: string, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
+        async apiSysAlipayAuthInfoGet(userId?: string, authCode?: string, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
-            return AlipayApiFp(configuration).apiAlipayGetAuthInfoGet(userId, authCode, options).then((request) => request(axios, basePath));
+            return SysAlipayApiFp(configuration).apiSysAlipayAuthInfoGet(userId, authCode, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -329,29 +329,29 @@ export const AlipayApiFactory = function (configuration?: Configuration, basePat
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiAlipayNotifyPost(options?: AxiosRequestConfig): Promise<AxiosResponse<AdminNETResultString>> {
+        async apiSysAlipayNotifyPost(options?: AxiosRequestConfig): Promise<AxiosResponse<AdminNETResultString>> {
-            return AlipayApiFp(configuration).apiAlipayNotifyPost(options).then((request) => request(axios, basePath));
+            return SysAlipayApiFp(configuration).apiSysAlipayNotifyPost(options).then((request) => request(axios, basePath));
         },
     };
 };
 
 /**
- * AlipayApi - object-oriented interface
+ * SysAlipayApi - object-oriented interface
  * @export
- * @class AlipayApi
+ * @class SysAlipayApi
  * @extends {BaseAPI}
  */
-export class AlipayApi extends BaseAPI {
+export class SysAlipayApi extends BaseAPI {
     /**
      * 
      * @summary 交易预创建 🔖
      * @param {AlipayPreCreateInput} [body] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
-     * @memberof AlipayApi
+     * @memberof SysAlipayApi
      */
-    public async apiAlipayAlipayPreCreatePost(body?: AlipayPreCreateInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminNETResultString>> {
+    public async apiSysAlipayAlipayPreCreatePost(body?: AlipayPreCreateInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminNETResultString>> {
-        return AlipayApiFp(this.configuration).apiAlipayAlipayPreCreatePost(body, options).then((request) => request(this.axios, this.basePath));
+        return SysAlipayApiFp(this.configuration).apiSysAlipayAlipayPreCreatePost(body, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
@@ -359,10 +359,10 @@ export class AlipayApi extends BaseAPI {
      * @param {AlipayTradePagePayInput} [body] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
-     * @memberof AlipayApi
+     * @memberof SysAlipayApi
      */
-    public async apiAlipayAlipayTradePagePayPost(body?: AlipayTradePagePayInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminNETResultString>> {
+    public async apiSysAlipayAlipayTradePagePayPost(body?: AlipayTradePagePayInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminNETResultString>> {
-        return AlipayApiFp(this.configuration).apiAlipayAlipayTradePagePayPost(body, options).then((request) => request(this.axios, this.basePath));
+        return SysAlipayApiFp(this.configuration).apiSysAlipayAlipayTradePagePayPost(body, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
@@ -371,19 +371,19 @@ export class AlipayApi extends BaseAPI {
      * @param {string} [authCode] 授权码
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
-     * @memberof AlipayApi
+     * @memberof SysAlipayApi
      */
-    public async apiAlipayGetAuthInfoGet(userId?: string, authCode?: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
+    public async apiSysAlipayAuthInfoGet(userId?: string, authCode?: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
-        return AlipayApiFp(this.configuration).apiAlipayGetAuthInfoGet(userId, authCode, options).then((request) => request(this.axios, this.basePath));
+        return SysAlipayApiFp(this.configuration).apiSysAlipayAuthInfoGet(userId, authCode, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
      * @summary 支付回调 🔖
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
-     * @memberof AlipayApi
+     * @memberof SysAlipayApi
      */
-    public async apiAlipayNotifyPost(options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminNETResultString>> {
+    public async apiSysAlipayNotifyPost(options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminNETResultString>> {
-        return AlipayApiFp(this.configuration).apiAlipayNotifyPost(options).then((request) => request(this.axios, this.basePath));
+        return SysAlipayApiFp(this.configuration).apiSysAlipayNotifyPost(options).then((request) => request(this.axios, this.basePath));
     }
 }

Web/src/api-services/apis/sys-code-gen-config-api.ts

@@ -17,9 +17,14 @@ import { Configuration } from '../configuration';
 // Some imports not used depending on template conditions
 // @ts-ignore
 import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from '../base';
+import { AdminNETResultIEnumerableEntityInfo } from '../models';
 import { AdminNETResultListCodeGenConfig } from '../models';
+import { AdminNETResultListColumnOuput } from '../models';
 import { AdminNETResultSysCodeGenConfig } from '../models';
 import { CodeGenConfig } from '../models';
+import { Filter } from '../models';
+import { FilterLogicEnum } from '../models';
+import { FilterOperatorEnum } from '../models';
 import { VerifyRuleItem } from '../models';
 /**
  * SysCodeGenConfigApi - axios parameter creator
@@ -27,6 +32,343 @@ import { VerifyRuleItem } from '../models';
  */
 export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Configuration) {
     return {
+        /**
+         * 
+         * @summary 获取数据表列（实体属性）集合
+         * @param {string} entityName 
+         * @param {string} configId 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiSysCodeGenConfigColumnListEntityNameConfigIdGet: async (entityName: string, configId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            // verify required parameter 'entityName' is not null or undefined
+            if (entityName === null || entityName === undefined) {
+                throw new RequiredError('entityName','Required parameter entityName was null or undefined when calling apiSysCodeGenConfigColumnListEntityNameConfigIdGet.');
+            }
+            // verify required parameter 'configId' is not null or undefined
+            if (configId === null || configId === undefined) {
+                throw new RequiredError('configId','Required parameter configId was null or undefined when calling apiSysCodeGenConfigColumnListEntityNameConfigIdGet.');
+            }
+            const localVarPath = `/api/sysCodeGenConfig/columnList/{entityName}/{configId}`
+                .replace(`{${"entityName"}}`, encodeURIComponent(String(entityName)))
+                .replace(`{${"configId"}}`, encodeURIComponent(String(configId)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions :AxiosRequestConfig = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
+
+            const query = new URLSearchParams(localVarUrlObj.search);
+            for (const key in localVarQueryParameter) {
+                query.set(key, localVarQueryParameter[key]);
+            }
+            for (const key in options.params) {
+                query.set(key, options.params[key]);
+            }
+            localVarUrlObj.search = (new URLSearchParams(query)).toString();
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @summary 获取数据表列（实体属性）集合
+         * @param {string} tableName 数据库表名
+         * @param {string} busName 业务名（业务代码包名称）
+         * @param {string} nameSpace 命名空间
+         * @param {string} authorName 作者姓名
+         * @param {string} generateType 生成方式
+         * @param {boolean} generateMenu 是否生成菜单
+         * @param {boolean} [isApiService] 是否使用 Api Service
+         * @param {Array<number>} [codeGenTemplateIds] 模板Id集合
+         * @param {string} [leftTab] 左边树形结构表
+         * @param {string} [leftKey] 左边关联字段
+         * @param {string} [leftPrimaryKey] 左边关联主表字段
+         * @param {string} [leftName] 左边树Name
+         * @param {string} [bottomTab] 下表名称
+         * @param {string} [bottomKey] 下表关联字段
+         * @param {string} [bottomPrimaryKey] 下表关联主表字段
+         * @param {string} [template] 模板
+         * @param {string} [className] 类名
+         * @param {string} [tablePrefix] 是否移除表前缀
+         * @param {string} [configId] 库定位器名
+         * @param {string} [dbName] 数据库名(保留字段)
+         * @param {string} [dbType] 数据库类型
+         * @param {string} [connectionString] 数据库链接
+         * @param {string} [treeName] 树控件名称
+         * @param {string} [tableComment] 功能名（数据库表名称）
+         * @param {string} [menuApplication] 菜单应用分类（应用编码）
+         * @param {number} [menuPid] 菜单父级
+         * @param {string} [menuIcon] 菜单图标
+         * @param {string} [pagePath] 页面目录
+         * @param {string} [printType] 支持打印类型
+         * @param {string} [printName] 打印模版名称
+         * @param {number} [page] 当前页码
+         * @param {number} [pageSize] 页码容量
+         * @param {string} [field] 排序字段
+         * @param {string} [order] 排序方向
+         * @param {string} [descStr] 降序排序
+         * @param {Array<string>} [searchFields] 字段名称集合
+         * @param {string} [searchKeyword] 关键字
+         * @param {string} [keyword] 模糊查询关键字
+         * @param {FilterLogicEnum} [filterLogic] 过滤条件
+         * @param {Array<Filter>} [filterFilters] 筛选过滤条件子项
+         * @param {string} [filterField] 字段名称
+         * @param {FilterOperatorEnum} [filterOperator] 逻辑运算符
+         * @param {any} [filterValue] 字段值
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiSysCodeGenConfigColumnListGet: async (tableName: string, busName: string, nameSpace: string, authorName: string, generateType: string, generateMenu: boolean, isApiService?: boolean, codeGenTemplateIds?: Array<number>, leftTab?: string, leftKey?: string, leftPrimaryKey?: string, leftName?: string, bottomTab?: string, bottomKey?: string, bottomPrimaryKey?: string, template?: string, className?: string, tablePrefix?: string, configId?: string, dbName?: string, dbType?: string, connectionString?: string, treeName?: string, tableComment?: string, menuApplication?: string, menuPid?: number, menuIcon?: string, pagePath?: string, printType?: string, printName?: string, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, searchFields?: Array<string>, searchKeyword?: string, keyword?: string, filterLogic?: FilterLogicEnum, filterFilters?: Array<Filter>, filterField?: string, filterOperator?: FilterOperatorEnum, filterValue?: any, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            // verify required parameter 'tableName' is not null or undefined
+            if (tableName === null || tableName === undefined) {
+                throw new RequiredError('tableName','Required parameter tableName was null or undefined when calling apiSysCodeGenConfigColumnListGet.');
+            }
+            // verify required parameter 'busName' is not null or undefined
+            if (busName === null || busName === undefined) {
+                throw new RequiredError('busName','Required parameter busName was null or undefined when calling apiSysCodeGenConfigColumnListGet.');
+            }
+            // verify required parameter 'nameSpace' is not null or undefined
+            if (nameSpace === null || nameSpace === undefined) {
+                throw new RequiredError('nameSpace','Required parameter nameSpace was null or undefined when calling apiSysCodeGenConfigColumnListGet.');
+            }
+            // verify required parameter 'authorName' is not null or undefined
+            if (authorName === null || authorName === undefined) {
+                throw new RequiredError('authorName','Required parameter authorName was null or undefined when calling apiSysCodeGenConfigColumnListGet.');
+            }
+            // verify required parameter 'generateType' is not null or undefined
+            if (generateType === null || generateType === undefined) {
+                throw new RequiredError('generateType','Required parameter generateType was null or undefined when calling apiSysCodeGenConfigColumnListGet.');
+            }
+            // verify required parameter 'generateMenu' is not null or undefined
+            if (generateMenu === null || generateMenu === undefined) {
+                throw new RequiredError('generateMenu','Required parameter generateMenu was null or undefined when calling apiSysCodeGenConfigColumnListGet.');
+            }
+            const localVarPath = `/api/sysCodeGenConfig/columnList`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions :AxiosRequestConfig = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
+
+            if (tableName !== undefined) {
+                localVarQueryParameter['TableName'] = tableName;
+            }
+
+            if (busName !== undefined) {
+                localVarQueryParameter['BusName'] = busName;
+            }
+
+            if (nameSpace !== undefined) {
+                localVarQueryParameter['NameSpace'] = nameSpace;
+            }
+
+            if (authorName !== undefined) {
+                localVarQueryParameter['AuthorName'] = authorName;
+            }
+
+            if (generateType !== undefined) {
+                localVarQueryParameter['GenerateType'] = generateType;
+            }
+
+            if (generateMenu !== undefined) {
+                localVarQueryParameter['GenerateMenu'] = generateMenu;
+            }
+
+            if (isApiService !== undefined) {
+                localVarQueryParameter['IsApiService'] = isApiService;
+            }
+
+            if (codeGenTemplateIds) {
+                localVarQueryParameter['CodeGenTemplateIds'] = codeGenTemplateIds;
+            }
+
+            if (leftTab !== undefined) {
+                localVarQueryParameter['LeftTab'] = leftTab;
+            }
+
+            if (leftKey !== undefined) {
+                localVarQueryParameter['LeftKey'] = leftKey;
+            }
+
+            if (leftPrimaryKey !== undefined) {
+                localVarQueryParameter['LeftPrimaryKey'] = leftPrimaryKey;
+            }
+
+            if (leftName !== undefined) {
+                localVarQueryParameter['LeftName'] = leftName;
+            }
+
+            if (bottomTab !== undefined) {
+                localVarQueryParameter['BottomTab'] = bottomTab;
+            }
+
+            if (bottomKey !== undefined) {
+                localVarQueryParameter['BottomKey'] = bottomKey;
+            }
+
+            if (bottomPrimaryKey !== undefined) {
+                localVarQueryParameter['BottomPrimaryKey'] = bottomPrimaryKey;
+            }
+
+            if (template !== undefined) {
+                localVarQueryParameter['Template'] = template;
+            }
+
+            if (className !== undefined) {
+                localVarQueryParameter['ClassName'] = className;
+            }
+
+            if (tablePrefix !== undefined) {
+                localVarQueryParameter['TablePrefix'] = tablePrefix;
+            }
+
+            if (configId !== undefined) {
+                localVarQueryParameter['ConfigId'] = configId;
+            }
+
+            if (dbName !== undefined) {
+                localVarQueryParameter['DbName'] = dbName;
+            }
+
+            if (dbType !== undefined) {
+                localVarQueryParameter['DbType'] = dbType;
+            }
+
+            if (connectionString !== undefined) {
+                localVarQueryParameter['ConnectionString'] = connectionString;
+            }
+
+            if (treeName !== undefined) {
+                localVarQueryParameter['TreeName'] = treeName;
+            }
+
+            if (tableComment !== undefined) {
+                localVarQueryParameter['TableComment'] = tableComment;
+            }
+
+            if (menuApplication !== undefined) {
+                localVarQueryParameter['MenuApplication'] = menuApplication;
+            }
+
+            if (menuPid !== undefined) {
+                localVarQueryParameter['MenuPid'] = menuPid;
+            }
+
+            if (menuIcon !== undefined) {
+                localVarQueryParameter['MenuIcon'] = menuIcon;
+            }
+
+            if (pagePath !== undefined) {
+                localVarQueryParameter['PagePath'] = pagePath;
+            }
+
+            if (printType !== undefined) {
+                localVarQueryParameter['PrintType'] = printType;
+            }
+
+            if (printName !== undefined) {
+                localVarQueryParameter['PrintName'] = printName;
+            }
+
+            if (page !== undefined) {
+                localVarQueryParameter['Page'] = page;
+            }
+
+            if (pageSize !== undefined) {
+                localVarQueryParameter['PageSize'] = pageSize;
+            }
+
+            if (field !== undefined) {
+                localVarQueryParameter['Field'] = field;
+            }
+
+            if (order !== undefined) {
+                localVarQueryParameter['Order'] = order;
+            }
+
+            if (descStr !== undefined) {
+                localVarQueryParameter['DescStr'] = descStr;
+            }
+
+            if (searchFields) {
+                localVarQueryParameter['Search.Fields'] = searchFields;
+            }
+
+            if (searchKeyword !== undefined) {
+                localVarQueryParameter['Search.Keyword'] = searchKeyword;
+            }
+
+            if (keyword !== undefined) {
+                localVarQueryParameter['Keyword'] = keyword;
+            }
+
+            if (filterLogic !== undefined) {
+                localVarQueryParameter['Filter.Logic'] = filterLogic;
+            }
+
+            if (filterFilters) {
+                localVarQueryParameter['Filter.Filters'] = filterFilters;
+            }
+
+            if (filterField !== undefined) {
+                localVarQueryParameter['Filter.Field'] = filterField;
+            }
+
+            if (filterOperator !== undefined) {
+                localVarQueryParameter['Filter.Operator'] = filterOperator;
+            }
+
+            if (filterValue !== undefined) {
+                localVarQueryParameter['Filter.Value'] = filterValue;
+            }
+
+            const query = new URLSearchParams(localVarUrlObj.search);
+            for (const key in localVarQueryParameter) {
+                query.set(key, localVarQueryParameter[key]);
+            }
+            for (const key in options.params) {
+                query.set(key, options.params[key]);
+            }
+            localVarUrlObj.search = (new URLSearchParams(query)).toString();
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @summary 获取代码生成配置详情 🔖
@@ -51,6 +393,7 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
          * @param {string} [whetherRetract] 列表是否缩进（字典）
          * @param {string} [whetherRequired] 是否必填（字典）
          * @param {string} [whetherSortable] 是否可排序（字典）
+         * @param {string} [statistical] 是否是统计字段
          * @param {string} [queryWhether] 是否是查询条件
          * @param {string} [queryType] 查询方式
          * @param {string} [whetherTable] 列表显示
@@ -72,7 +415,7 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiSysCodeGenConfigDetailGet: async (id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, fkLinkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, rules?: string, defaultValue?: string, ruleItems?: Array<VerifyRuleItem>, remoteVerify?: boolean, anyRule?: boolean, trigger?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        apiSysCodeGenConfigDetailGet: async (id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, fkLinkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, statistical?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, rules?: string, defaultValue?: string, ruleItems?: Array<VerifyRuleItem>, remoteVerify?: boolean, anyRule?: boolean, trigger?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/api/sysCodeGenConfig/detail`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
@@ -177,6 +520,10 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
                 localVarQueryParameter['WhetherSortable'] = whetherSortable;
             }
 
+            if (statistical !== undefined) {
+                localVarQueryParameter['Statistical'] = statistical;
+            }
+
             if (queryWhether !== undefined) {
                 localVarQueryParameter['QueryWhether'] = queryWhether;
             }
@@ -265,6 +612,55 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * 
+         * @summary 获取库表信息
+         * @param {boolean} excludeSysTable 是否排除带SysTable属性的表
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiSysCodeGenConfigEntityInfosExcludeSysTableGet: async (excludeSysTable: boolean, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            // verify required parameter 'excludeSysTable' is not null or undefined
+            if (excludeSysTable === null || excludeSysTable === undefined) {
+                throw new RequiredError('excludeSysTable','Required parameter excludeSysTable was null or undefined when calling apiSysCodeGenConfigEntityInfosExcludeSysTableGet.');
+            }
+            const localVarPath = `/api/sysCodeGenConfig/entityInfos/{excludeSysTable}`
+                .replace(`{${"excludeSysTable"}}`, encodeURIComponent(String(excludeSysTable)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions :AxiosRequestConfig = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
+
+            const query = new URLSearchParams(localVarUrlObj.search);
+            for (const key in localVarQueryParameter) {
+                query.set(key, localVarQueryParameter[key]);
+            }
+            for (const key in options.params) {
+                query.set(key, options.params[key]);
+            }
+            localVarUrlObj.search = (new URLSearchParams(query)).toString();
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @summary 获取代码生成配置列表 🔖
@@ -289,6 +685,7 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
          * @param {string} [whetherRetract] 列表是否缩进（字典）
          * @param {string} [whetherRequired] 是否必填（字典）
          * @param {string} [whetherSortable] 是否可排序（字典）
+         * @param {string} [statistical] 是否是统计字段
          * @param {string} [queryWhether] 是否是查询条件
          * @param {string} [queryType] 查询方式
          * @param {string} [whetherTable] 列表显示
@@ -310,7 +707,7 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiSysCodeGenConfigListGet: async (id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, fkLinkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, rules?: string, defaultValue?: string, ruleItems?: Array<VerifyRuleItem>, remoteVerify?: boolean, anyRule?: boolean, trigger?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        apiSysCodeGenConfigListGet: async (id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, fkLinkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, statistical?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, rules?: string, defaultValue?: string, ruleItems?: Array<VerifyRuleItem>, remoteVerify?: boolean, anyRule?: boolean, trigger?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/api/sysCodeGenConfig/list`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
@@ -415,6 +812,10 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
                 localVarQueryParameter['WhetherSortable'] = whetherSortable;
             }
 
+            if (statistical !== undefined) {
+                localVarQueryParameter['Statistical'] = statistical;
+            }
+
             if (queryWhether !== undefined) {
                 localVarQueryParameter['QueryWhether'] = queryWhether;
             }
@@ -560,6 +961,77 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
  */
 export const SysCodeGenConfigApiFp = function(configuration?: Configuration) {
     return {
+        /**
+         * 
+         * @summary 获取数据表列（实体属性）集合
+         * @param {string} entityName 
+         * @param {string} configId 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysCodeGenConfigColumnListEntityNameConfigIdGet(entityName: string, configId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminNETResultListColumnOuput>>> {
+            const localVarAxiosArgs = await SysCodeGenConfigApiAxiosParamCreator(configuration).apiSysCodeGenConfigColumnListEntityNameConfigIdGet(entityName, configId, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
+        /**
+         * 
+         * @summary 获取数据表列（实体属性）集合
+         * @param {string} tableName 数据库表名
+         * @param {string} busName 业务名（业务代码包名称）
+         * @param {string} nameSpace 命名空间
+         * @param {string} authorName 作者姓名
+         * @param {string} generateType 生成方式
+         * @param {boolean} generateMenu 是否生成菜单
+         * @param {boolean} [isApiService] 是否使用 Api Service
+         * @param {Array<number>} [codeGenTemplateIds] 模板Id集合
+         * @param {string} [leftTab] 左边树形结构表
+         * @param {string} [leftKey] 左边关联字段
+         * @param {string} [leftPrimaryKey] 左边关联主表字段
+         * @param {string} [leftName] 左边树Name
+         * @param {string} [bottomTab] 下表名称
+         * @param {string} [bottomKey] 下表关联字段
+         * @param {string} [bottomPrimaryKey] 下表关联主表字段
+         * @param {string} [template] 模板
+         * @param {string} [className] 类名
+         * @param {string} [tablePrefix] 是否移除表前缀
+         * @param {string} [configId] 库定位器名
+         * @param {string} [dbName] 数据库名(保留字段)
+         * @param {string} [dbType] 数据库类型
+         * @param {string} [connectionString] 数据库链接
+         * @param {string} [treeName] 树控件名称
+         * @param {string} [tableComment] 功能名（数据库表名称）
+         * @param {string} [menuApplication] 菜单应用分类（应用编码）
+         * @param {number} [menuPid] 菜单父级
+         * @param {string} [menuIcon] 菜单图标
+         * @param {string} [pagePath] 页面目录
+         * @param {string} [printType] 支持打印类型
+         * @param {string} [printName] 打印模版名称
+         * @param {number} [page] 当前页码
+         * @param {number} [pageSize] 页码容量
+         * @param {string} [field] 排序字段
+         * @param {string} [order] 排序方向
+         * @param {string} [descStr] 降序排序
+         * @param {Array<string>} [searchFields] 字段名称集合
+         * @param {string} [searchKeyword] 关键字
+         * @param {string} [keyword] 模糊查询关键字
+         * @param {FilterLogicEnum} [filterLogic] 过滤条件
+         * @param {Array<Filter>} [filterFilters] 筛选过滤条件子项
+         * @param {string} [filterField] 字段名称
+         * @param {FilterOperatorEnum} [filterOperator] 逻辑运算符
+         * @param {any} [filterValue] 字段值
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysCodeGenConfigColumnListGet(tableName: string, busName: string, nameSpace: string, authorName: string, generateType: string, generateMenu: boolean, isApiService?: boolean, codeGenTemplateIds?: Array<number>, leftTab?: string, leftKey?: string, leftPrimaryKey?: string, leftName?: string, bottomTab?: string, bottomKey?: string, bottomPrimaryKey?: string, template?: string, className?: string, tablePrefix?: string, configId?: string, dbName?: string, dbType?: string, connectionString?: string, treeName?: string, tableComment?: string, menuApplication?: string, menuPid?: number, menuIcon?: string, pagePath?: string, printType?: string, printName?: string, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, searchFields?: Array<string>, searchKeyword?: string, keyword?: string, filterLogic?: FilterLogicEnum, filterFilters?: Array<Filter>, filterField?: string, filterOperator?: FilterOperatorEnum, filterValue?: any, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminNETResultListColumnOuput>>> {
+            const localVarAxiosArgs = await SysCodeGenConfigApiAxiosParamCreator(configuration).apiSysCodeGenConfigColumnListGet(tableName, busName, nameSpace, authorName, generateType, generateMenu, isApiService, codeGenTemplateIds, leftTab, leftKey, leftPrimaryKey, leftName, bottomTab, bottomKey, bottomPrimaryKey, template, className, tablePrefix, configId, dbName, dbType, connectionString, treeName, tableComment, menuApplication, menuPid, menuIcon, pagePath, printType, printName, page, pageSize, field, order, descStr, searchFields, searchKeyword, keyword, filterLogic, filterFilters, filterField, filterOperator, filterValue, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
         /**
          * 
          * @summary 获取代码生成配置详情 🔖
@@ -584,6 +1056,7 @@ export const SysCodeGenConfigApiFp = function(configuration?: Configuration) {
          * @param {string} [whetherRetract] 列表是否缩进（字典）
          * @param {string} [whetherRequired] 是否必填（字典）
          * @param {string} [whetherSortable] 是否可排序（字典）
+         * @param {string} [statistical] 是否是统计字段
          * @param {string} [queryWhether] 是否是查询条件
          * @param {string} [queryType] 查询方式
          * @param {string} [whetherTable] 列表显示
@@ -605,8 +1078,22 @@ export const SysCodeGenConfigApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysCodeGenConfigDetailGet(id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, fkLinkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, rules?: string, defaultValue?: string, ruleItems?: Array<VerifyRuleItem>, remoteVerify?: boolean, anyRule?: boolean, trigger?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminNETResultSysCodeGenConfig>>> {
+        async apiSysCodeGenConfigDetailGet(id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, fkLinkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, statistical?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, rules?: string, defaultValue?: string, ruleItems?: Array<VerifyRuleItem>, remoteVerify?: boolean, anyRule?: boolean, trigger?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminNETResultSysCodeGenConfig>>> {
-            const localVarAxiosArgs = await SysCodeGenConfigApiAxiosParamCreator(configuration).apiSysCodeGenConfigDetailGet(id, codeGenId, columnName, propertyName, columnLength, lowerPropertyName, columnComment, netType, effectType, fkConfigId, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, fkLinkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, whetherSortable, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, rules, defaultValue, ruleItems, remoteVerify, anyRule, trigger, options);
+            const localVarAxiosArgs = await SysCodeGenConfigApiAxiosParamCreator(configuration).apiSysCodeGenConfigDetailGet(id, codeGenId, columnName, propertyName, columnLength, lowerPropertyName, columnComment, netType, effectType, fkConfigId, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, fkLinkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, whetherSortable, statistical, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, rules, defaultValue, ruleItems, remoteVerify, anyRule, trigger, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
+        /**
+         * 
+         * @summary 获取库表信息
+         * @param {boolean} excludeSysTable 是否排除带SysTable属性的表
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysCodeGenConfigEntityInfosExcludeSysTableGet(excludeSysTable: boolean, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminNETResultIEnumerableEntityInfo>>> {
+            const localVarAxiosArgs = await SysCodeGenConfigApiAxiosParamCreator(configuration).apiSysCodeGenConfigEntityInfosExcludeSysTableGet(excludeSysTable, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -636,6 +1123,7 @@ export const SysCodeGenConfigApiFp = function(configuration?: Configuration) {
          * @param {string} [whetherRetract] 列表是否缩进（字典）
          * @param {string} [whetherRequired] 是否必填（字典）
          * @param {string} [whetherSortable] 是否可排序（字典）
+         * @param {string} [statistical] 是否是统计字段
          * @param {string} [queryWhether] 是否是查询条件
          * @param {string} [queryType] 查询方式
          * @param {string} [whetherTable] 列表显示
@@ -657,8 +1145,8 @@ export const SysCodeGenConfigApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysCodeGenConfigListGet(id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, fkLinkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, rules?: string, defaultValue?: string, ruleItems?: Array<VerifyRuleItem>, remoteVerify?: boolean, anyRule?: boolean, trigger?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminNETResultListCodeGenConfig>>> {
+        async apiSysCodeGenConfigListGet(id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, fkLinkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, statistical?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, rules?: string, defaultValue?: string, ruleItems?: Array<VerifyRuleItem>, remoteVerify?: boolean, anyRule?: boolean, trigger?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminNETResultListCodeGenConfig>>> {
-            const localVarAxiosArgs = await SysCodeGenConfigApiAxiosParamCreator(configuration).apiSysCodeGenConfigListGet(id, codeGenId, columnName, propertyName, columnLength, lowerPropertyName, columnComment, netType, effectType, fkConfigId, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, fkLinkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, whetherSortable, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, rules, defaultValue, ruleItems, remoteVerify, anyRule, trigger, options);
+            const localVarAxiosArgs = await SysCodeGenConfigApiAxiosParamCreator(configuration).apiSysCodeGenConfigListGet(id, codeGenId, columnName, propertyName, columnLength, lowerPropertyName, columnComment, netType, effectType, fkConfigId, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, fkLinkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, whetherSortable, statistical, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, rules, defaultValue, ruleItems, remoteVerify, anyRule, trigger, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -687,6 +1175,69 @@ export const SysCodeGenConfigApiFp = function(configuration?: Configuration) {
  */
 export const SysCodeGenConfigApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
     return {
+        /**
+         * 
+         * @summary 获取数据表列（实体属性）集合
+         * @param {string} entityName 
+         * @param {string} configId 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysCodeGenConfigColumnListEntityNameConfigIdGet(entityName: string, configId: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminNETResultListColumnOuput>> {
+            return SysCodeGenConfigApiFp(configuration).apiSysCodeGenConfigColumnListEntityNameConfigIdGet(entityName, configId, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @summary 获取数据表列（实体属性）集合
+         * @param {string} tableName 数据库表名
+         * @param {string} busName 业务名（业务代码包名称）
+         * @param {string} nameSpace 命名空间
+         * @param {string} authorName 作者姓名
+         * @param {string} generateType 生成方式
+         * @param {boolean} generateMenu 是否生成菜单
+         * @param {boolean} [isApiService] 是否使用 Api Service
+         * @param {Array<number>} [codeGenTemplateIds] 模板Id集合
+         * @param {string} [leftTab] 左边树形结构表
+         * @param {string} [leftKey] 左边关联字段
+         * @param {string} [leftPrimaryKey] 左边关联主表字段
+         * @param {string} [leftName] 左边树Name
+         * @param {string} [bottomTab] 下表名称
+         * @param {string} [bottomKey] 下表关联字段
+         * @param {string} [bottomPrimaryKey] 下表关联主表字段
+         * @param {string} [template] 模板
+         * @param {string} [className] 类名
+         * @param {string} [tablePrefix] 是否移除表前缀
+         * @param {string} [configId] 库定位器名
+         * @param {string} [dbName] 数据库名(保留字段)
+         * @param {string} [dbType] 数据库类型
+         * @param {string} [connectionString] 数据库链接
+         * @param {string} [treeName] 树控件名称
+         * @param {string} [tableComment] 功能名（数据库表名称）
+         * @param {string} [menuApplication] 菜单应用分类（应用编码）
+         * @param {number} [menuPid] 菜单父级
+         * @param {string} [menuIcon] 菜单图标
+         * @param {string} [pagePath] 页面目录
+         * @param {string} [printType] 支持打印类型
+         * @param {string} [printName] 打印模版名称
+         * @param {number} [page] 当前页码
+         * @param {number} [pageSize] 页码容量
+         * @param {string} [field] 排序字段
+         * @param {string} [order] 排序方向
+         * @param {string} [descStr] 降序排序
+         * @param {Array<string>} [searchFields] 字段名称集合
+         * @param {string} [searchKeyword] 关键字
+         * @param {string} [keyword] 模糊查询关键字
+         * @param {FilterLogicEnum} [filterLogic] 过滤条件
+         * @param {Array<Filter>} [filterFilters] 筛选过滤条件子项
+         * @param {string} [filterField] 字段名称
+         * @param {FilterOperatorEnum} [filterOperator] 逻辑运算符
+         * @param {any} [filterValue] 字段值
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysCodeGenConfigColumnListGet(tableName: string, busName: string, nameSpace: string, authorName: string, generateType: string, generateMenu: boolean, isApiService?: boolean, codeGenTemplateIds?: Array<number>, leftTab?: string, leftKey?: string, leftPrimaryKey?: string, leftName?: string, bottomTab?: string, bottomKey?: string, bottomPrimaryKey?: string, template?: string, className?: string, tablePrefix?: string, configId?: string, dbName?: string, dbType?: string, connectionString?: string, treeName?: string, tableComment?: string, menuApplication?: string, menuPid?: number, menuIcon?: string, pagePath?: string, printType?: string, printName?: string, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, searchFields?: Array<string>, searchKeyword?: string, keyword?: string, filterLogic?: FilterLogicEnum, filterFilters?: Array<Filter>, filterField?: string, filterOperator?: FilterOperatorEnum, filterValue?: any, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminNETResultListColumnOuput>> {
+            return SysCodeGenConfigApiFp(configuration).apiSysCodeGenConfigColumnListGet(tableName, busName, nameSpace, authorName, generateType, generateMenu, isApiService, codeGenTemplateIds, leftTab, leftKey, leftPrimaryKey, leftName, bottomTab, bottomKey, bottomPrimaryKey, template, className, tablePrefix, configId, dbName, dbType, connectionString, treeName, tableComment, menuApplication, menuPid, menuIcon, pagePath, printType, printName, page, pageSize, field, order, descStr, searchFields, searchKeyword, keyword, filterLogic, filterFilters, filterField, filterOperator, filterValue, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @summary 获取代码生成配置详情 🔖
@@ -711,6 +1262,7 @@ export const SysCodeGenConfigApiFactory = function (configuration?: Configuratio
          * @param {string} [whetherRetract] 列表是否缩进（字典）
          * @param {string} [whetherRequired] 是否必填（字典）
          * @param {string} [whetherSortable] 是否可排序（字典）
+         * @param {string} [statistical] 是否是统计字段
          * @param {string} [queryWhether] 是否是查询条件
          * @param {string} [queryType] 查询方式
          * @param {string} [whetherTable] 列表显示
@@ -732,8 +1284,18 @@ export const SysCodeGenConfigApiFactory = function (configuration?: Configuratio
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysCodeGenConfigDetailGet(id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, fkLinkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, rules?: string, defaultValue?: string, ruleItems?: Array<VerifyRuleItem>, remoteVerify?: boolean, anyRule?: boolean, trigger?: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminNETResultSysCodeGenConfig>> {
+        async apiSysCodeGenConfigDetailGet(id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, fkLinkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, statistical?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, rules?: string, defaultValue?: string, ruleItems?: Array<VerifyRuleItem>, remoteVerify?: boolean, anyRule?: boolean, trigger?: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminNETResultSysCodeGenConfig>> {
-            return SysCodeGenConfigApiFp(configuration).apiSysCodeGenConfigDetailGet(id, codeGenId, columnName, propertyName, columnLength, lowerPropertyName, columnComment, netType, effectType, fkConfigId, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, fkLinkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, whetherSortable, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, rules, defaultValue, ruleItems, remoteVerify, anyRule, trigger, options).then((request) => request(axios, basePath));
+            return SysCodeGenConfigApiFp(configuration).apiSysCodeGenConfigDetailGet(id, codeGenId, columnName, propertyName, columnLength, lowerPropertyName, columnComment, netType, effectType, fkConfigId, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, fkLinkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, whetherSortable, statistical, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, rules, defaultValue, ruleItems, remoteVerify, anyRule, trigger, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @summary 获取库表信息
+         * @param {boolean} excludeSysTable 是否排除带SysTable属性的表
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysCodeGenConfigEntityInfosExcludeSysTableGet(excludeSysTable: boolean, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminNETResultIEnumerableEntityInfo>> {
+            return SysCodeGenConfigApiFp(configuration).apiSysCodeGenConfigEntityInfosExcludeSysTableGet(excludeSysTable, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -759,6 +1321,7 @@ export const SysCodeGenConfigApiFactory = function (configuration?: Configuratio
          * @param {string} [whetherRetract] 列表是否缩进（字典）
          * @param {string} [whetherRequired] 是否必填（字典）
          * @param {string} [whetherSortable] 是否可排序（字典）
+         * @param {string} [statistical] 是否是统计字段
          * @param {string} [queryWhether] 是否是查询条件
          * @param {string} [queryType] 查询方式
          * @param {string} [whetherTable] 列表显示
@@ -780,8 +1343,8 @@ export const SysCodeGenConfigApiFactory = function (configuration?: Configuratio
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async apiSysCodeGenConfigListGet(id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, fkLinkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, rules?: string, defaultValue?: string, ruleItems?: Array<VerifyRuleItem>, remoteVerify?: boolean, anyRule?: boolean, trigger?: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminNETResultListCodeGenConfig>> {
+        async apiSysCodeGenConfigListGet(id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, fkLinkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, statistical?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, rules?: string, defaultValue?: string, ruleItems?: Array<VerifyRuleItem>, remoteVerify?: boolean, anyRule?: boolean, trigger?: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminNETResultListCodeGenConfig>> {
-            return SysCodeGenConfigApiFp(configuration).apiSysCodeGenConfigListGet(id, codeGenId, columnName, propertyName, columnLength, lowerPropertyName, columnComment, netType, effectType, fkConfigId, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, fkLinkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, whetherSortable, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, rules, defaultValue, ruleItems, remoteVerify, anyRule, trigger, options).then((request) => request(axios, basePath));
+            return SysCodeGenConfigApiFp(configuration).apiSysCodeGenConfigListGet(id, codeGenId, columnName, propertyName, columnLength, lowerPropertyName, columnComment, netType, effectType, fkConfigId, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, fkLinkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, whetherSortable, statistical, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, rules, defaultValue, ruleItems, remoteVerify, anyRule, trigger, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -803,6 +1366,71 @@ export const SysCodeGenConfigApiFactory = function (configuration?: Configuratio
  * @extends {BaseAPI}
  */
 export class SysCodeGenConfigApi extends BaseAPI {
+    /**
+     * 
+     * @summary 获取数据表列（实体属性）集合
+     * @param {string} entityName 
+     * @param {string} configId 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof SysCodeGenConfigApi
+     */
+    public async apiSysCodeGenConfigColumnListEntityNameConfigIdGet(entityName: string, configId: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminNETResultListColumnOuput>> {
+        return SysCodeGenConfigApiFp(this.configuration).apiSysCodeGenConfigColumnListEntityNameConfigIdGet(entityName, configId, options).then((request) => request(this.axios, this.basePath));
+    }
+    /**
+     * 
+     * @summary 获取数据表列（实体属性）集合
+     * @param {string} tableName 数据库表名
+     * @param {string} busName 业务名（业务代码包名称）
+     * @param {string} nameSpace 命名空间
+     * @param {string} authorName 作者姓名
+     * @param {string} generateType 生成方式
+     * @param {boolean} generateMenu 是否生成菜单
+     * @param {boolean} [isApiService] 是否使用 Api Service
+     * @param {Array<number>} [codeGenTemplateIds] 模板Id集合
+     * @param {string} [leftTab] 左边树形结构表
+     * @param {string} [leftKey] 左边关联字段
+     * @param {string} [leftPrimaryKey] 左边关联主表字段
+     * @param {string} [leftName] 左边树Name
+     * @param {string} [bottomTab] 下表名称
+     * @param {string} [bottomKey] 下表关联字段
+     * @param {string} [bottomPrimaryKey] 下表关联主表字段
+     * @param {string} [template] 模板
+     * @param {string} [className] 类名
+     * @param {string} [tablePrefix] 是否移除表前缀
+     * @param {string} [configId] 库定位器名
+     * @param {string} [dbName] 数据库名(保留字段)
+     * @param {string} [dbType] 数据库类型
+     * @param {string} [connectionString] 数据库链接
+     * @param {string} [treeName] 树控件名称
+     * @param {string} [tableComment] 功能名（数据库表名称）
+     * @param {string} [menuApplication] 菜单应用分类（应用编码）
+     * @param {number} [menuPid] 菜单父级
+     * @param {string} [menuIcon] 菜单图标
+     * @param {string} [pagePath] 页面目录
+     * @param {string} [printType] 支持打印类型
+     * @param {string} [printName] 打印模版名称
+     * @param {number} [page] 当前页码
+     * @param {number} [pageSize] 页码容量
+     * @param {string} [field] 排序字段
+     * @param {string} [order] 排序方向
+     * @param {string} [descStr] 降序排序
+     * @param {Array<string>} [searchFields] 字段名称集合
+     * @param {string} [searchKeyword] 关键字
+     * @param {string} [keyword] 模糊查询关键字
+     * @param {FilterLogicEnum} [filterLogic] 过滤条件
+     * @param {Array<Filter>} [filterFilters] 筛选过滤条件子项
+     * @param {string} [filterField] 字段名称
+     * @param {FilterOperatorEnum} [filterOperator] 逻辑运算符
+     * @param {any} [filterValue] 字段值
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof SysCodeGenConfigApi
+     */
+    public async apiSysCodeGenConfigColumnListGet(tableName: string, busName: string, nameSpace: string, authorName: string, generateType: string, generateMenu: boolean, isApiService?: boolean, codeGenTemplateIds?: Array<number>, leftTab?: string, leftKey?: string, leftPrimaryKey?: string, leftName?: string, bottomTab?: string, bottomKey?: string, bottomPrimaryKey?: string, template?: string, className?: string, tablePrefix?: string, configId?: string, dbName?: string, dbType?: string, connectionString?: string, treeName?: string, tableComment?: string, menuApplication?: string, menuPid?: number, menuIcon?: string, pagePath?: string, printType?: string, printName?: string, page?: number, pageSize?: number, field?: string, order?: string, descStr?: string, searchFields?: Array<string>, searchKeyword?: string, keyword?: string, filterLogic?: FilterLogicEnum, filterFilters?: Array<Filter>, filterField?: string, filterOperator?: FilterOperatorEnum, filterValue?: any, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminNETResultListColumnOuput>> {
+        return SysCodeGenConfigApiFp(this.configuration).apiSysCodeGenConfigColumnListGet(tableName, busName, nameSpace, authorName, generateType, generateMenu, isApiService, codeGenTemplateIds, leftTab, leftKey, leftPrimaryKey, leftName, bottomTab, bottomKey, bottomPrimaryKey, template, className, tablePrefix, configId, dbName, dbType, connectionString, treeName, tableComment, menuApplication, menuPid, menuIcon, pagePath, printType, printName, page, pageSize, field, order, descStr, searchFields, searchKeyword, keyword, filterLogic, filterFilters, filterField, filterOperator, filterValue, options).then((request) => request(this.axios, this.basePath));
+    }
     /**
      * 
      * @summary 获取代码生成配置详情 🔖
@@ -827,6 +1455,7 @@ export class SysCodeGenConfigApi extends BaseAPI {
      * @param {string} [whetherRetract] 列表是否缩进（字典）
      * @param {string} [whetherRequired] 是否必填（字典）
      * @param {string} [whetherSortable] 是否可排序（字典）
+     * @param {string} [statistical] 是否是统计字段
      * @param {string} [queryWhether] 是否是查询条件
      * @param {string} [queryType] 查询方式
      * @param {string} [whetherTable] 列表显示
@@ -849,8 +1478,19 @@ export class SysCodeGenConfigApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof SysCodeGenConfigApi
      */
-    public async apiSysCodeGenConfigDetailGet(id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, fkLinkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, rules?: string, defaultValue?: string, ruleItems?: Array<VerifyRuleItem>, remoteVerify?: boolean, anyRule?: boolean, trigger?: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminNETResultSysCodeGenConfig>> {
+    public async apiSysCodeGenConfigDetailGet(id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, fkLinkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, statistical?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, rules?: string, defaultValue?: string, ruleItems?: Array<VerifyRuleItem>, remoteVerify?: boolean, anyRule?: boolean, trigger?: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminNETResultSysCodeGenConfig>> {
-        return SysCodeGenConfigApiFp(this.configuration).apiSysCodeGenConfigDetailGet(id, codeGenId, columnName, propertyName, columnLength, lowerPropertyName, columnComment, netType, effectType, fkConfigId, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, fkLinkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, whetherSortable, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, rules, defaultValue, ruleItems, remoteVerify, anyRule, trigger, options).then((request) => request(this.axios, this.basePath));
+        return SysCodeGenConfigApiFp(this.configuration).apiSysCodeGenConfigDetailGet(id, codeGenId, columnName, propertyName, columnLength, lowerPropertyName, columnComment, netType, effectType, fkConfigId, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, fkLinkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, whetherSortable, statistical, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, rules, defaultValue, ruleItems, remoteVerify, anyRule, trigger, options).then((request) => request(this.axios, this.basePath));
+    }
+    /**
+     * 
+     * @summary 获取库表信息
+     * @param {boolean} excludeSysTable 是否排除带SysTable属性的表
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof SysCodeGenConfigApi
+     */
+    public async apiSysCodeGenConfigEntityInfosExcludeSysTableGet(excludeSysTable: boolean, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminNETResultIEnumerableEntityInfo>> {
+        return SysCodeGenConfigApiFp(this.configuration).apiSysCodeGenConfigEntityInfosExcludeSysTableGet(excludeSysTable, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
@@ -876,6 +1516,7 @@ export class SysCodeGenConfigApi extends BaseAPI {
      * @param {string} [whetherRetract] 列表是否缩进（字典）
      * @param {string} [whetherRequired] 是否必填（字典）
      * @param {string} [whetherSortable] 是否可排序（字典）
+     * @param {string} [statistical] 是否是统计字段
      * @param {string} [queryWhether] 是否是查询条件
      * @param {string} [queryType] 查询方式
      * @param {string} [whetherTable] 列表显示
@@ -898,8 +1539,8 @@ export class SysCodeGenConfigApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof SysCodeGenConfigApi
      */
-    public async apiSysCodeGenConfigListGet(id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, fkLinkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, rules?: string, defaultValue?: string, ruleItems?: Array<VerifyRuleItem>, remoteVerify?: boolean, anyRule?: boolean, trigger?: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminNETResultListCodeGenConfig>> {
+    public async apiSysCodeGenConfigListGet(id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: string, fkLinkColumnName?: string, lowerFkColumnName?: string, fkColumnNetType?: string, dictTypeCode?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, statistical?: string, queryWhether?: string, queryType?: string, whetherTable?: string, whetherAddUpdate?: string, columnKey?: string, dataType?: string, whetherCommon?: string, tableNickName?: string, displayColumn?: string, valueColumn?: string, pidColumn?: string, orderNo?: number, rules?: string, defaultValue?: string, ruleItems?: Array<VerifyRuleItem>, remoteVerify?: boolean, anyRule?: boolean, trigger?: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminNETResultListCodeGenConfig>> {
-        return SysCodeGenConfigApiFp(this.configuration).apiSysCodeGenConfigListGet(id, codeGenId, columnName, propertyName, columnLength, lowerPropertyName, columnComment, netType, effectType, fkConfigId, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, fkLinkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, whetherSortable, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, rules, defaultValue, ruleItems, remoteVerify, anyRule, trigger, options).then((request) => request(this.axios, this.basePath));
+        return SysCodeGenConfigApiFp(this.configuration).apiSysCodeGenConfigListGet(id, codeGenId, columnName, propertyName, columnLength, lowerPropertyName, columnComment, netType, effectType, fkConfigId, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, fkLinkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, whetherSortable, statistical, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, rules, defaultValue, ruleItems, remoteVerify, anyRule, trigger, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 

Web/src/api-services/apis/sys-common-api.ts

@@ -176,7 +176,7 @@ export const SysCommonApiAxiosParamCreator = function (configuration?: Configura
         },
         /**
          * 
-         * @summary 生成所有移动端接口 🔖
+         * @summary 生成所有移动端接口文件 🔖
          * @param {string} [groupName] 
          * @param {boolean} [isAppApi] 
          * @param {*} [options] Override http request option.
@@ -567,7 +567,7 @@ export const SysCommonApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
-         * @summary 生成所有移动端接口 🔖
+         * @summary 生成所有移动端接口文件 🔖
          * @param {string} [groupName] 
          * @param {boolean} [isAppApi] 
          * @param {*} [options] Override http request option.
@@ -704,7 +704,7 @@ export const SysCommonApiFactory = function (configuration?: Configuration, base
         },
         /**
          * 
-         * @summary 生成所有移动端接口 🔖
+         * @summary 生成所有移动端接口文件 🔖
          * @param {string} [groupName] 
          * @param {boolean} [isAppApi] 
          * @param {*} [options] Override http request option.
@@ -817,7 +817,7 @@ export class SysCommonApi extends BaseAPI {
     }
     /**
      * 
-     * @summary 生成所有移动端接口 🔖
+     * @summary 生成所有移动端接口文件 🔖
      * @param {string} [groupName] 
      * @param {boolean} [isAppApi] 
      * @param {*} [options] Override http request option.

Web/src/api-services/apis/sys-database-api.ts

@@ -20,6 +20,7 @@ import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } fr
 import { AdminNETResultListDbColumnOutput } from '../models';
 import { AdminNETResultListDbTableInfo } from '../models';
 import { AdminNETResultListString } from '../models';
+import { AdminNETResultString } from '../models';
 import { AdminNETResultVisualDbTable } from '../models';
 import { CreateEntityInput } from '../models';
 import { CreateSeedDataInput } from '../models';
@@ -470,6 +471,121 @@ export const SysDatabaseApiAxiosParamCreator = function (configuration?: Configu
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * 
+         * @summary 创建实体文件内容
+         * @param {string} configId 
+         * @param {string} tableName 
+         * @param {string} position 
+         * @param {string} baseClassName 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiSysDatabaseGenerateEntityConfigIdTableNamePositionBaseClassNamePost: async (configId: string, tableName: string, position: string, baseClassName: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            // verify required parameter 'configId' is not null or undefined
+            if (configId === null || configId === undefined) {
+                throw new RequiredError('configId','Required parameter configId was null or undefined when calling apiSysDatabaseGenerateEntityConfigIdTableNamePositionBaseClassNamePost.');
+            }
+            // verify required parameter 'tableName' is not null or undefined
+            if (tableName === null || tableName === undefined) {
+                throw new RequiredError('tableName','Required parameter tableName was null or undefined when calling apiSysDatabaseGenerateEntityConfigIdTableNamePositionBaseClassNamePost.');
+            }
+            // verify required parameter 'position' is not null or undefined
+            if (position === null || position === undefined) {
+                throw new RequiredError('position','Required parameter position was null or undefined when calling apiSysDatabaseGenerateEntityConfigIdTableNamePositionBaseClassNamePost.');
+            }
+            // verify required parameter 'baseClassName' is not null or undefined
+            if (baseClassName === null || baseClassName === undefined) {
+                throw new RequiredError('baseClassName','Required parameter baseClassName was null or undefined when calling apiSysDatabaseGenerateEntityConfigIdTableNamePositionBaseClassNamePost.');
+            }
+            const localVarPath = `/api/sysDatabase/generateEntity/{configId}/{tableName}/{position}/{baseClassName}`
+                .replace(`{${"configId"}}`, encodeURIComponent(String(configId)))
+                .replace(`{${"tableName"}}`, encodeURIComponent(String(tableName)))
+                .replace(`{${"position"}}`, encodeURIComponent(String(position)))
+                .replace(`{${"baseClassName"}}`, encodeURIComponent(String(baseClassName)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions :AxiosRequestConfig = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
+
+            const query = new URLSearchParams(localVarUrlObj.search);
+            for (const key in localVarQueryParameter) {
+                query.set(key, localVarQueryParameter[key]);
+            }
+            for (const key in options.params) {
+                query.set(key, options.params[key]);
+            }
+            localVarUrlObj.search = (new URLSearchParams(query)).toString();
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @summary 创建实体文件内容
+         * @param {CreateEntityInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiSysDatabaseGenerateEntityPost: async (body?: CreateEntityInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/sysDatabase/generateEntity`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions :AxiosRequestConfig = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
+
+            localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
+
+            const query = new URLSearchParams(localVarUrlObj.search);
+            for (const key in localVarQueryParameter) {
+                query.set(key, localVarQueryParameter[key]);
+            }
+            for (const key in options.params) {
+                query.set(key, options.params[key]);
+            }
+            localVarUrlObj.search = (new URLSearchParams(query)).toString();
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
+            localVarRequestOptions.data =  needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
+
+            return {
+                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @summary 获取库列表 🔖
@@ -836,6 +952,37 @@ export const SysDatabaseApiFp = function(configuration?: Configuration) {
                 return axios.request(axiosRequestArgs);
             };
         },
+        /**
+         * 
+         * @summary 创建实体文件内容
+         * @param {string} configId 
+         * @param {string} tableName 
+         * @param {string} position 
+         * @param {string} baseClassName 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysDatabaseGenerateEntityConfigIdTableNamePositionBaseClassNamePost(configId: string, tableName: string, position: string, baseClassName: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminNETResultString>>> {
+            const localVarAxiosArgs = await SysDatabaseApiAxiosParamCreator(configuration).apiSysDatabaseGenerateEntityConfigIdTableNamePositionBaseClassNamePost(configId, tableName, position, baseClassName, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
+        /**
+         * 
+         * @summary 创建实体文件内容
+         * @param {CreateEntityInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysDatabaseGenerateEntityPost(body?: CreateEntityInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminNETResultString>>> {
+            const localVarAxiosArgs = await SysDatabaseApiAxiosParamCreator(configuration).apiSysDatabaseGenerateEntityPost(body, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
         /**
          * 
          * @summary 获取库列表 🔖
@@ -1003,6 +1150,29 @@ export const SysDatabaseApiFactory = function (configuration?: Configuration, ba
         async apiSysDatabaseDeleteTablePost(body?: DeleteDbTableInput, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
             return SysDatabaseApiFp(configuration).apiSysDatabaseDeleteTablePost(body, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @summary 创建实体文件内容
+         * @param {string} configId 
+         * @param {string} tableName 
+         * @param {string} position 
+         * @param {string} baseClassName 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysDatabaseGenerateEntityConfigIdTableNamePositionBaseClassNamePost(configId: string, tableName: string, position: string, baseClassName: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminNETResultString>> {
+            return SysDatabaseApiFp(configuration).apiSysDatabaseGenerateEntityConfigIdTableNamePositionBaseClassNamePost(configId, tableName, position, baseClassName, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @summary 创建实体文件内容
+         * @param {CreateEntityInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysDatabaseGenerateEntityPost(body?: CreateEntityInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminNETResultString>> {
+            return SysDatabaseApiFp(configuration).apiSysDatabaseGenerateEntityPost(body, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @summary 获取库列表 🔖
@@ -1160,6 +1330,31 @@ export class SysDatabaseApi extends BaseAPI {
     public async apiSysDatabaseDeleteTablePost(body?: DeleteDbTableInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
         return SysDatabaseApiFp(this.configuration).apiSysDatabaseDeleteTablePost(body, options).then((request) => request(this.axios, this.basePath));
     }
+    /**
+     * 
+     * @summary 创建实体文件内容
+     * @param {string} configId 
+     * @param {string} tableName 
+     * @param {string} position 
+     * @param {string} baseClassName 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof SysDatabaseApi
+     */
+    public async apiSysDatabaseGenerateEntityConfigIdTableNamePositionBaseClassNamePost(configId: string, tableName: string, position: string, baseClassName: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminNETResultString>> {
+        return SysDatabaseApiFp(this.configuration).apiSysDatabaseGenerateEntityConfigIdTableNamePositionBaseClassNamePost(configId, tableName, position, baseClassName, options).then((request) => request(this.axios, this.basePath));
+    }
+    /**
+     * 
+     * @summary 创建实体文件内容
+     * @param {CreateEntityInput} [body] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof SysDatabaseApi
+     */
+    public async apiSysDatabaseGenerateEntityPost(body?: CreateEntityInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminNETResultString>> {
+        return SysDatabaseApiFp(this.configuration).apiSysDatabaseGenerateEntityPost(body, options).then((request) => request(this.axios, this.basePath));
+    }
     /**
      * 
      * @summary 获取库列表 🔖

Web/src/api-services/base.ts

@@ -17,7 +17,7 @@ import { Configuration } from "./configuration";
 // @ts-ignore
 import globalAxios, { AxiosRequestConfig, AxiosInstance } from 'axios';
 
-export const BASE_PATH = "http://localhost:5005".replace(/\/+$/, "");
+export const BASE_PATH = "/".replace(/\/+$/, "");
 
 /**
  *

Web/src/api-services/models/add-tenant-input.ts

@@ -287,7 +287,7 @@ export interface AddTenantInput {
      * @type {boolean}
      * @memberof AddTenantInput
      */
-    captcha?: boolean;
+    captcha?: boolean | null;
 
     /**
      * 登录二次验证
@@ -295,7 +295,7 @@ export interface AddTenantInput {
      * @type {boolean}
      * @memberof AddTenantInput
      */
-    secondVer?: boolean;
+    secondVer?: boolean | null;
 
     /**
      * 真实姓名

Web/src/api-services/models/admin-netresult-ienumerable-entity-info.ts

@@ -0,0 +1,71 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Admin.NET 通用权限开发平台
+ * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。<br/><u><b><font color='FF0000'> 👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！</font></b></u>
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+import { EntityInfo } from './entity-info';
+ /**
+ * 全局返回结果
+ *
+ * @export
+ * @interface AdminNETResultIEnumerableEntityInfo
+ */
+export interface AdminNETResultIEnumerableEntityInfo {
+
+    /**
+     * 状态码
+     *
+     * @type {number}
+     * @memberof AdminNETResultIEnumerableEntityInfo
+     */
+    code?: number;
+
+    /**
+     * 类型success、warning、error
+     *
+     * @type {string}
+     * @memberof AdminNETResultIEnumerableEntityInfo
+     */
+    type?: string | null;
+
+    /**
+     * 错误信息
+     *
+     * @type {string}
+     * @memberof AdminNETResultIEnumerableEntityInfo
+     */
+    message?: string | null;
+
+    /**
+     * 数据
+     *
+     * @type {Array<EntityInfo>}
+     * @memberof AdminNETResultIEnumerableEntityInfo
+     */
+    result?: Array<EntityInfo> | null;
+
+    /**
+     * 附加数据
+     *
+     * @type {any}
+     * @memberof AdminNETResultIEnumerableEntityInfo
+     */
+    extras?: any | null;
+
+    /**
+     * 时间
+     *
+     * @type {Date}
+     * @memberof AdminNETResultIEnumerableEntityInfo
+     */
+    time?: Date;
+}

Web/src/api-services/models/code-gen-config.ts

@@ -189,6 +189,14 @@ export interface CodeGenConfig {
      */
     whetherSortable?: string | null;
 
+    /**
+     * 是否是统计字段
+     *
+     * @type {string}
+     * @memberof CodeGenConfig
+     */
+    statistical?: string | null;
+
     /**
      * 是否是查询条件
      *

Web/src/api-services/models/entity-column-info.ts

@@ -0,0 +1,271 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Admin.NET 通用权限开发平台
+ * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。<br/><u><b><font color='FF0000'> 👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！</font></b></u>
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+import { Navigate } from './navigate';
+import { PropertyInfo } from './property-info';
+import { Type } from './type';
+ /**
+ * 
+ *
+ * @export
+ * @interface EntityColumnInfo
+ */
+export interface EntityColumnInfo {
+
+    /**
+     * @type {PropertyInfo}
+     * @memberof EntityColumnInfo
+     */
+    propertyInfo?: PropertyInfo;
+
+    /**
+     * @type {string}
+     * @memberof EntityColumnInfo
+     */
+    propertyName?: string | null;
+
+    /**
+     * @type {string}
+     * @memberof EntityColumnInfo
+     */
+    dbColumnName?: string | null;
+
+    /**
+     * @type {string}
+     * @memberof EntityColumnInfo
+     */
+    oldDbColumnName?: string | null;
+
+    /**
+     * @type {number}
+     * @memberof EntityColumnInfo
+     */
+    length?: number;
+
+    /**
+     * @type {string}
+     * @memberof EntityColumnInfo
+     */
+    columnDescription?: string | null;
+
+    /**
+     * @type {string}
+     * @memberof EntityColumnInfo
+     */
+    defaultValue?: string | null;
+
+    /**
+     * @type {boolean}
+     * @memberof EntityColumnInfo
+     */
+    isNullable?: boolean;
+
+    /**
+     * @type {boolean}
+     * @memberof EntityColumnInfo
+     */
+    isIdentity?: boolean;
+
+    /**
+     * @type {boolean}
+     * @memberof EntityColumnInfo
+     */
+    isPrimarykey?: boolean;
+
+    /**
+     * @type {boolean}
+     * @memberof EntityColumnInfo
+     */
+    isTreeKey?: boolean;
+
+    /**
+     * @type {boolean}
+     * @memberof EntityColumnInfo
+     */
+    isEnableUpdateVersionValidation?: boolean;
+
+    /**
+     * @type {any}
+     * @memberof EntityColumnInfo
+     */
+    sqlParameterDbType?: any | null;
+
+    /**
+     * @type {string}
+     * @memberof EntityColumnInfo
+     */
+    entityName?: string | null;
+
+    /**
+     * @type {string}
+     * @memberof EntityColumnInfo
+     */
+    dbTableName?: string | null;
+
+    /**
+     * @type {boolean}
+     * @memberof EntityColumnInfo
+     */
+    isIgnore?: boolean;
+
+    /**
+     * @type {string}
+     * @memberof EntityColumnInfo
+     */
+    dataType?: string | null;
+
+    /**
+     * @type {number}
+     * @memberof EntityColumnInfo
+     */
+    decimalDigits?: number;
+
+    /**
+     * @type {string}
+     * @memberof EntityColumnInfo
+     */
+    oracleSequenceName?: string | null;
+
+    /**
+     * @type {boolean}
+     * @memberof EntityColumnInfo
+     */
+    isOnlyIgnoreInsert?: boolean;
+
+    /**
+     * @type {boolean}
+     * @memberof EntityColumnInfo
+     */
+    isOnlyIgnoreUpdate?: boolean;
+
+    /**
+     * @type {boolean}
+     * @memberof EntityColumnInfo
+     */
+    isTranscoding?: boolean;
+
+    /**
+     * @type {string}
+     * @memberof EntityColumnInfo
+     */
+    serializeDateTimeFormat?: string | null;
+
+    /**
+     * @type {boolean}
+     * @memberof EntityColumnInfo
+     */
+    isJson?: boolean;
+
+    /**
+     * @type {boolean}
+     * @memberof EntityColumnInfo
+     */
+    noSerialize?: boolean;
+
+    /**
+     * @type {Array<string>}
+     * @memberof EntityColumnInfo
+     */
+    indexGroupNameList?: Array<string> | null;
+
+    /**
+     * @type {Array<string>}
+     * @memberof EntityColumnInfo
+     */
+    uIndexGroupNameList?: Array<string> | null;
+
+    /**
+     * @type {boolean}
+     * @memberof EntityColumnInfo
+     */
+    isArray?: boolean;
+
+    /**
+     * @type {Type}
+     * @memberof EntityColumnInfo
+     */
+    underType?: Type;
+
+    /**
+     * @type {Navigate}
+     * @memberof EntityColumnInfo
+     */
+    navigat?: Navigate;
+
+    /**
+     * @type {number}
+     * @memberof EntityColumnInfo
+     */
+    createTableFieldSort?: number;
+
+    /**
+     * @type {any}
+     * @memberof EntityColumnInfo
+     */
+    sqlParameterSize?: any | null;
+
+    /**
+     * @type {string}
+     * @memberof EntityColumnInfo
+     */
+    insertSql?: string | null;
+
+    /**
+     * @type {boolean}
+     * @memberof EntityColumnInfo
+     */
+    insertServerTime?: boolean;
+
+    /**
+     * @type {boolean}
+     * @memberof EntityColumnInfo
+     */
+    updateServerTime?: boolean;
+
+    /**
+     * @type {string}
+     * @memberof EntityColumnInfo
+     */
+    updateSql?: string | null;
+
+    /**
+     * @type {any}
+     * @memberof EntityColumnInfo
+     */
+    extendedAttribute?: any | null;
+
+    /**
+     * @type {boolean}
+     * @memberof EntityColumnInfo
+     */
+    isDisabledAlterColumn?: boolean;
+
+    /**
+     * @type {string}
+     * @memberof EntityColumnInfo
+     */
+    querySql?: string | null;
+
+    /**
+     * @type {boolean}
+     * @memberof EntityColumnInfo
+     */
+    isOwnsOne?: boolean;
+
+    /**
+     * @type {PropertyInfo}
+     * @memberof EntityColumnInfo
+     */
+    forOwnsOnePropertyInfo?: PropertyInfo;
+}

Web/src/api-services/models/entity-info.ts

@@ -0,0 +1,85 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Admin.NET 通用权限开发平台
+ * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。<br/><u><b><font color='FF0000'> 👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！</font></b></u>
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+import { EntityColumnInfo } from './entity-column-info';
+import { SugarIndexAttribute } from './sugar-index-attribute';
+import { Type } from './type';
+ /**
+ * 
+ *
+ * @export
+ * @interface EntityInfo
+ */
+export interface EntityInfo {
+
+    /**
+     * @type {string}
+     * @memberof EntityInfo
+     */
+    entityName?: string | null;
+
+    /**
+     * @type {string}
+     * @memberof EntityInfo
+     */
+    dbTableName?: string | null;
+
+    /**
+     * @type {string}
+     * @memberof EntityInfo
+     */
+    tableDescription?: string | null;
+
+    /**
+     * @type {Type}
+     * @memberof EntityInfo
+     */
+    type?: Type;
+
+    /**
+     * @type {Array<EntityColumnInfo>}
+     * @memberof EntityInfo
+     */
+    columns?: Array<EntityColumnInfo> | null;
+
+    /**
+     * @type {boolean}
+     * @memberof EntityInfo
+     */
+    isDisabledDelete?: boolean;
+
+    /**
+     * @type {boolean}
+     * @memberof EntityInfo
+     */
+    isDisabledUpdateAll?: boolean;
+
+    /**
+     * @type {Array<SugarIndexAttribute>}
+     * @memberof EntityInfo
+     */
+    indexs?: Array<SugarIndexAttribute> | null;
+
+    /**
+     * @type {boolean}
+     * @memberof EntityInfo
+     */
+    isCreateTableFiledSort?: boolean;
+
+    /**
+     * @type {string}
+     * @memberof EntityInfo
+     */
+    discrimator?: string | null;
+}

Web/src/api-services/models/index.ts

@@ -32,6 +32,7 @@ export * from './admin-netresult-get-refund-domestic-refund-by-out-refund-number
 export * from './admin-netresult-grant-role-output';
 export * from './admin-netresult-iaction-result';
 export * from './admin-netresult-idisposable';
+export * from './admin-netresult-ienumerable-entity-info';
 export * from './admin-netresult-int32';
 export * from './admin-netresult-int64';
 export * from './admin-netresult-jobject';
@@ -204,6 +205,8 @@ export * from './delete-user-input';
 export * from './dict-data-input';
 export * from './dict-type-input';
 export * from './digit-shapes';
+export * from './entity-column-info';
+export * from './entity-info';
 export * from './enum-entity';
 export * from './enum-type-output';
 export * from './event-attributes';
@@ -268,6 +271,7 @@ export * from './method-impl-attributes';
 export * from './method-info';
 export * from './module';
 export * from './module-handle';
+export * from './navigate';
 export * from './notice-input';
 export * from './notice-status-enum';
 export * from './notice-type-enum';
@@ -276,6 +280,7 @@ export * from './number-format-info';
 export * from './oauth-user-input';
 export * from './oauth-user-output';
 export * from './open-access-output';
+export * from './order-by-type';
 export * from './page-code-gen-input';
 export * from './page-config-input';
 export * from './page-dict-data-input';
@@ -367,6 +372,7 @@ export * from './status-enum';
 export * from './stress-test-harness-result';
 export * from './stress-test-input';
 export * from './struct-layout-attribute';
+export * from './sugar-index-attribute';
 export * from './swagger-submit-url-body';
 export * from './sync-sys-ldap-input';
 export * from './sys-code-gen';

Web/src/api-services/models/navigate.ts

@@ -0,0 +1,28 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Admin.NET 通用权限开发平台
+ * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。<br/><u><b><font color='FF0000'> 👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！</font></b></u>
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+ /**
+ * 
+ *
+ * @export
+ * @interface Navigate
+ */
+export interface Navigate {
+
+    /**
+     * @type {any}
+     * @memberof Navigate
+     */
+    typeId?: any | null;
+}

Web/src/api-services/models/order-by-type.ts

@@ -0,0 +1,24 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Admin.NET 通用权限开发平台
+ * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。<br/><u><b><font color='FF0000'> 👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！</font></b></u>
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+/**
+ * 
+ * @export
+ * @enum {string}
+ */
+export enum OrderByType {
+    NUMBER_0 = 0,
+    NUMBER_1 = 1
+}
+

Web/src/api-services/models/sugar-index-attribute.ts

@@ -0,0 +1,47 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Admin.NET 通用权限开发平台
+ * 让 .NET 开发更简单、更通用、更流行。整合最新技术，模块插件式开发，前后端分离，开箱即用。<br/><u><b><font color='FF0000'> 👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！</font></b></u>
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+import { OrderByType } from './order-by-type';
+ /**
+ * 
+ *
+ * @export
+ * @interface SugarIndexAttribute
+ */
+export interface SugarIndexAttribute {
+
+    /**
+     * @type {any}
+     * @memberof SugarIndexAttribute
+     */
+    typeId?: any | null;
+
+    /**
+     * @type {string}
+     * @memberof SugarIndexAttribute
+     */
+    indexName?: string | null;
+
+    /**
+     * @type {{ [key: string]: OrderByType; }}
+     * @memberof SugarIndexAttribute
+     */
+    indexFields?: { [key: string]: OrderByType; } | null;
+
+    /**
+     * @type {boolean}
+     * @memberof SugarIndexAttribute
+     */
+    isUnique?: boolean;
+}

Web/src/api-services/models/sys-code-gen-config.ts

@@ -220,6 +220,14 @@ export interface SysCodeGenConfig {
      */
     whetherSortable?: string | null;
 
+    /**
+     * 是否是统计字段
+     *
+     * @type {string}
+     * @memberof SysCodeGenConfig
+     */
+    statistical?: string | null;
+
     /**
      * 是否是查询条件
      *

Web/src/api-services/models/tenant-output.ts

@@ -287,7 +287,7 @@ export interface TenantOutput {
      * @type {boolean}
      * @memberof TenantOutput
      */
-    captcha?: boolean;
+    captcha?: boolean | null;
 
     /**
      * 登录二次验证
@@ -295,7 +295,7 @@ export interface TenantOutput {
      * @type {boolean}
      * @memberof TenantOutput
      */
-    secondVer?: boolean;
+    secondVer?: boolean | null;
 
     /**
      * 租户名称

Web/src/api-services/models/update-tenant-input.ts

@@ -287,7 +287,7 @@ export interface UpdateTenantInput {
      * @type {boolean}
      * @memberof UpdateTenantInput
      */
-    captcha?: boolean;
+    captcha?: boolean | null;
 
     /**
      * 登录二次验证
@@ -295,7 +295,7 @@ export interface UpdateTenantInput {
      * @type {boolean}
      * @memberof UpdateTenantInput
      */
-    secondVer?: boolean;
+    secondVer?: boolean | null;
 
     /**
      * 真实姓名

Web/src/router/index.ts

@@ -6,7 +6,7 @@ import { storeToRefs } from 'pinia';
 import { useKeepALiveNames } from '/@/stores/keepAliveNames';
 import { useRoutesList } from '/@/stores/routesList';
 import { useThemeConfig } from '/@/stores/themeConfig';
-import { Session } from '/@/utils/storage';
+import { Session, Local } from '/@/utils/storage';
 import { staticRoutes, notFoundAndNoPower } from '/@/router/route';
 import { initFrontEndControlRoutes } from '/@/router/frontEnd';
 import { initBackEndControlRoutes } from '/@/router/backEnd';
@@ -102,7 +102,13 @@ router.beforeEach(async (to, from, next) => {
 		NProgress.done();
 	} else {
 		if (!token) {
-			next(`/login?redirect=${to.path}&params=${JSON.stringify(to.query ? to.query : to.params)}`);
+			var routeLocation = `/login?redirect=${to.path}&params=${JSON.stringify(to.query ? to.query : to.params)}`;
+			// 附加租户Id标识
+			var tenantid = Number(Local.get('tid'));
+			if (!isNaN(tenantid) && tenantid > 99999) {
+				routeLocation += `&tid=${tenantid}`;
+			}
+			next(routeLocation);
 			Session.clear();
 			NProgress.done();
 		} else if (token && to.path === '/login') {

Web/src/utils/storage.ts

@@ -28,7 +28,9 @@ export const Local = {
 	},
 	// 移除全部永久缓存
 	clear() {
+		var tid = Local.get('tid');
 		window.localStorage.clear();
+		Local.set('tid', tid);
 	},
 };
 

Web/src/views/login/index.vue

@@ -65,6 +65,7 @@ import loginIconTwo1 from '/@/assets/login-icon-two1.svg';
 import loginIconTwo2 from '/@/assets/login-icon-two2.svg';
 // 加载系统信息
 import { loadSysInfo } from '/@/utils/sysInfo';
+import { Local } from '/@/utils/storage';
 
 // 引入组件
 const Account = defineAsyncComponent(() => import('/@/views/login/component/account.vue'));
@@ -84,8 +85,14 @@ const getThemeConfig = computed(() => {
 });
 // 页面加载时
 onMounted(() => {
-	var tenantid = route.query.tenantid ?? 0;
+	// 获取租户Id标识
-	loadSysInfo(Number(tenantid));
+	var tenantid = Number(route.query.tid);
+	if (isNaN(tenantid)) {
+		tenantid = 0;
+	} else if (tenantid > 99999) {
+		Local.set('tid', tenantid);
+	}
+	loadSysInfo(tenantid);
 
 	NextLoading.done();
 });

Web/src/views/system/codeGen/component/genConfigDialog.vue

@@ -1,7 +1,6 @@
 <template>
 	<div class="sys-codeGenConfig-container">
-		<vxe-modal v-model="state.isShowDialog" title="生成配置" :width="800" :height="350" show-footer show-zoom resize
+		<vxe-modal v-model="state.isShowDialog" title="生成配置" :width="800" :height="350" show-footer show-zoom resize fullscreen @close="cancel">
-			fullscreen @close="cancel">
 			<template #default>
 				<vxe-grid ref="xGrid" class="xGrid-table-style" v-bind="options">
 					<template #drag_default="{}">
@@ -10,23 +9,17 @@
 						</span>
 					</template>
 					<template #effectType="{ row, $index }">
-						<vxe-select v-model="row.effectType" class="m-2" style="width: 70%" placeholder="Select"
+						<vxe-select v-model="row.effectType" class="m-2" style="width: 70%" placeholder="Select" transfer :disabled="judgeColumns(row)" @change="effectTypeChange(row, $index)" filterable>
-							transfer :disabled="judgeColumns(row)" @change="effectTypeChange(row, $index)" filterable>
+							<vxe-option v-for="item in state.effectTypeList" :key="item.code" :label="item.value" :value="item.code" />
-							<vxe-option v-for="item in state.effectTypeList" :key="item.code" :label="item.value"
-								:value="item.code" />
 						</vxe-select>
-						<vxe-button v-if="row.effectType === 'ApiTreeSelector' || row.effectType === 'ForeignKey'"
+						<vxe-button v-if="row.effectType === 'ApiTreeSelector' || row.effectType === 'ForeignKey'" style="width: 30%" icon="vxe-icon-edit" @click="effectTypeChange(row, $index)">修改</vxe-button>
-							style="width: 30%" icon="vxe-icon-edit"
-							@click="effectTypeChange(row, $index)">修改</vxe-button>
 					</template>
 					<template #columnComment="{ row }">
 						<vxe-input v-model="row.columnComment" autocomplete="off" />
 					</template>
 					<template #dictType="{ row }">
-						<vxe-select v-model="row.dictTypeCode" class="m-2" :disabled="effectTypeEnable(row)" filterable
+						<vxe-select v-model="row.dictTypeCode" class="m-2" :disabled="effectTypeEnable(row)" filterable transfer>
-							transfer>
+							<vxe-option v-for="item in state.dictTypeCodeList" :key="item.code" :label="item.name" :value="item.code" />
-							<vxe-option v-for="item in state.dictTypeCodeList" :key="item.code" :label="item.name"
-								:value="item.code" />
 						</vxe-select>
 					</template>
 					<template #whetherTable="{ row }">
@@ -43,23 +36,18 @@
 						<vxe-tag v-else status="info">否</vxe-tag>
 					</template>
 					<template #statistical="{ row }">
-						<vxe-switch v-model="row.statistical" open-label="是" close-label="否" :openValue="true"
+						<vxe-switch v-model="row.statistical" open-label="是" close-label="否" :openValue="true" :closeValue="false"></vxe-switch>
-							:closeValue="false"></vxe-switch>
 					</template>
 					<template #queryWhether="{ row }">
-						<vxe-switch v-model="row.queryWhether" open-label="是" close-label="否" :openValue="true"
+						<vxe-switch v-model="row.queryWhether" open-label="是" close-label="否" :openValue="true" :closeValue="false"></vxe-switch>
-							:closeValue="false"></vxe-switch>
 					</template>
 					<template #queryType="{ row }">
-						<vxe-select v-model="row.queryType" class="m-2" placeholder="Select"
+						<vxe-select v-model="row.queryType" class="m-2" placeholder="Select" :disabled="!row.queryWhether" filterable transfer>
-							:disabled="!row.queryWhether" filterable transfer>
+							<vxe-option v-for="item in state.queryTypeList" :key="item.code" :label="item.value" :value="item.code" />
-							<vxe-option v-for="item in state.queryTypeList" :key="item.code" :label="item.value"
-								:value="item.code" />
 						</vxe-select>
 					</template>
 					<template #verification="{ row }">
-						<vxe-button status="primary" plain v-if="row.columnKey === 'False' && !row.whetherCommon"
+						<vxe-button status="primary" plain v-if="row.columnKey === 'False' && !row.whetherCommon" @click="openVerifyDialog(row)">校验规则{{ row.ruleCount }}</vxe-button>
-							@click="openVerifyDialog(row)">校验规则{{ row.ruleCount }}</vxe-button>
 						<span v-else></span>
 					</template>
 				</vxe-grid>
@@ -99,7 +87,7 @@ const state = reactive({
 	isShowDialog: false,
 	loading: false,
 	EntityName: '',
-	ConfigId:'',
+	ConfigId: '',
 	dbData: [] as any,
 	effectTypeList: [] as any,
 	dictTypeCodeList: [] as any,
@@ -308,7 +296,7 @@ const submitRefreshFk = (data: any) => {
 // 页面初始化
 onUnmounted(() => {
 	// mittBus.off('submitRefresh', () => {});
-	mittBus.off('submitRefreshFk', () => { });
+	mittBus.off('submitRefreshFk', () => {});
 });
 
 // 控件类型改变
@@ -368,8 +356,8 @@ function effectTypeEnable(data: any) {
 // 打开弹窗
 const openDialog = async (addRow: any) => {
 	state.isShowDialog = true;
-    state.ConfigId=addRow.configId;
+	state.ConfigId = addRow.configId;
-	state.EntityName=addRow.tableName;
+	state.EntityName = addRow.tableName;
 	nextTick(async () => {
 		await handleQuery(addRow);
 		rowDrop();

Web/src/views/system/infoSetting/index.vue

@@ -20,7 +20,7 @@
 					</template>
 					{{ state.sysInfo.tenantId }}
 					<p>
-						<el-tag style="border: 1 solid var(--el-border-color)">访问地址：{{ host }}/#/login?tenantid={{ state.sysInfo.tenantId }}</el-tag>
+						<el-tag style="border: 1 solid var(--el-border-color)">访问地址：{{ host }}/#/login?tid={{ state.sysInfo.tenantId }}</el-tag>
 					</p>
 				</el-descriptions-item>
 				<el-descriptions-item label="系统主标题">