Przeglądaj źródła

😎1、调整生成前端请求批处理命令及更新接口 2、代码清理及格式化,升级前后端依赖

zuohuaijun 9 miesięcy temu
rodzic
commit
d0d6d5785a

+ 2 - 2
Admin.NET/Admin.NET.Application/Configuration/CDConfig.json

@@ -3,9 +3,9 @@
 
 
   "CDConfig": {
   "CDConfig": {
     "Enabled": true, // 启用持续部署
     "Enabled": true, // 启用持续部署
-    "Owner": "jasondom", // gitee用户名
+    "Owner": "zuohuaijun", // gitee用户名
     "Repo": "Admin.NET", // 仓库名
     "Repo": "Admin.NET", // 仓库名
-    "Branch": "next", // 分支名
+    "Branch": "v2", // 分支名
     "AccessToken": "xxxxxxxxxxxxxxxxxxxxxxxxx", // gitee用户授权码
     "AccessToken": "xxxxxxxxxxxxxxxxxxxxxxxxx", // gitee用户授权码
     "UpdateInterval": 0, // 最小更新间隔(分钟),0不限制
     "UpdateInterval": 0, // 最小更新间隔(分钟),0不限制
     "BackupCount": 10, // 备份文件保留数量,0不限制
     "BackupCount": 10, // 备份文件保留数量,0不限制

+ 7 - 7
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -19,9 +19,9 @@
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.0.7" />
     <PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.0.7" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.93" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.93" />
-    <PackageReference Include="Furion.Pure" Version="4.9.7.93" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.96" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.96" />
+    <PackageReference Include="Furion.Pure" Version="4.9.7.96" />
 	<PackageReference Include="Hardware.Info" Version="101.0.1.1" />
 	<PackageReference Include="Hardware.Info" Version="101.0.1.1" />
     <PackageReference Include="Hashids.net" Version="1.7.0" />
     <PackageReference Include="Hashids.net" Version="1.7.0" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
@@ -66,11 +66,11 @@
     <PackageReference Include="AspNet.Security.OAuth.Gitee" Version="9.4.0" />
     <PackageReference Include="AspNet.Security.OAuth.Gitee" Version="9.4.0" />
     <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="9.4.0" />
     <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="9.4.0" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.1.0" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.6" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="9.0.6" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.7" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="9.0.7" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.7" />
 	<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.5.2" />
 	<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.5.2" />
-	<PackageReference Include="XiHan.Framework.Utils" Version="0.11.3" />
+	<PackageReference Include="XiHan.Framework.Utils" Version="0.11.5" />
   </ItemGroup>
   </ItemGroup>
 
 
 </Project>
 </Project>

+ 0 - 1
Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs

@@ -331,7 +331,6 @@ public class SysAuthService : IDynamicApiController, ITransient
         loginUser.CurrentTenantId = currentTenantId > 0 ? currentTenantId : user.TenantId;
         loginUser.CurrentTenantId = currentTenantId > 0 ? currentTenantId : user.TenantId;
 
 
         return loginUser;
         return loginUser;
-
     }
     }
 
 
     /// <summary>
     /// <summary>

+ 3 - 1
Admin.NET/Admin.NET.Core/Service/CodeGen/CustomViewEngine.cs

@@ -103,7 +103,7 @@ public class CustomViewEngine : ViewEngineModel
     /// 默认值列表
     /// 默认值列表
     /// </summary>
     /// </summary>
     public List<CodeGenConfig> DefaultValueList { get; set; }
     public List<CodeGenConfig> DefaultValueList { get; set; }
-    
+
     /// <summary>
     /// <summary>
     /// 判断字段是否为状态字段
     /// 判断字段是否为状态字段
     /// </summary>
     /// </summary>
@@ -163,9 +163,11 @@ public class CustomViewEngine : ViewEngineModel
                         case "InputNumber":
                         case "InputNumber":
                             content += $"{item.LowerPropertyName}: {item.DefaultValue},";
                             content += $"{item.LowerPropertyName}: {item.DefaultValue},";
                             break;
                             break;
+
                         case "Switch":
                         case "Switch":
                             content += $"{item.LowerPropertyName}: {(item.DefaultValue == "1" ? true.ToString().ToLower() : false.ToString().ToLower())},";
                             content += $"{item.LowerPropertyName}: {(item.DefaultValue == "1" ? true.ToString().ToLower() : false.ToString().ToLower())},";
                             break;
                             break;
+
                         default:
                         default:
                             content += $"{item.LowerPropertyName}: '{item.DefaultValue}',";
                             content += $"{item.LowerPropertyName}: '{item.DefaultValue}',";
                             break;
                             break;

+ 1 - 0
Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CodeGenConfig.cs

@@ -65,6 +65,7 @@ public class CodeGenConfig
     /// 字段数据默认值
     /// 字段数据默认值
     /// </summary>
     /// </summary>
     public string DefaultValue { get; set; }
     public string DefaultValue { get; set; }
+
     /// <summary>
     /// <summary>
     /// 可空.NET类型
     /// 可空.NET类型
     /// </summary>
     /// </summary>

+ 3 - 4
Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs

@@ -115,7 +115,6 @@ public class SysCodeGenService : IDynamicApiController, ITransient
             _codeGenConfigService.AddList(GetColumnList(input.Adapt<AddCodeGenInput>()), codeGen);
             _codeGenConfigService.AddList(GetColumnList(input.Adapt<AddCodeGenInput>()), codeGen);
             //}
             //}
             _db.AsTenant().CommitTran();
             _db.AsTenant().CommitTran();
-
         }
         }
         catch (Exception ex)
         catch (Exception ex)
         {
         {
@@ -452,12 +451,12 @@ public class SysCodeGenService : IDynamicApiController, ITransient
             TableField = tableFieldList,
             TableField = tableFieldList,
             QueryWhetherList = tableFieldList.Where(u => u.WhetherQuery == "Y").ToList(),
             QueryWhetherList = tableFieldList.Where(u => u.WhetherQuery == "Y").ToList(),
             ImportFieldList = tableFieldList.Where(u => u.WhetherImport == "Y").ToList(),
             ImportFieldList = tableFieldList.Where(u => u.WhetherImport == "Y").ToList(),
-            UploadFieldList = tableFieldList.Where(u => u.EffectType == "Upload"|| u.EffectType == "Upload_SingleFile").ToList(),
+            UploadFieldList = tableFieldList.Where(u => u.EffectType == "Upload" || u.EffectType == "Upload_SingleFile").ToList(),
             PrimaryKeyFieldList = tableFieldList.Where(c => c.ColumnKey == "True").ToList(),
             PrimaryKeyFieldList = tableFieldList.Where(c => c.ColumnKey == "True").ToList(),
             AddUpdateFieldList = tableFieldList.Where(u => u.WhetherAddUpdate == "Y").ToList(),
             AddUpdateFieldList = tableFieldList.Where(u => u.WhetherAddUpdate == "Y").ToList(),
             ApiTreeFieldList = tableFieldList.Where(u => u.EffectType == "ApiTreeSelector").ToList(),
             ApiTreeFieldList = tableFieldList.Where(u => u.EffectType == "ApiTreeSelector").ToList(),
             DropdownFieldList = tableFieldList.Where(u => u.EffectType is "ForeignKey" or "ApiTreeSelector").ToList(),
             DropdownFieldList = tableFieldList.Where(u => u.EffectType is "ForeignKey" or "ApiTreeSelector").ToList(),
-            DefaultValueList = tableFieldList.Where(u => u.DefaultValue != null && u.DefaultValue.Length>0).ToList(),
+            DefaultValueList = tableFieldList.Where(u => u.DefaultValue != null && u.DefaultValue.Length > 0).ToList(),
 
 
             HasJoinTable = joinTableList.Count > 0,
             HasJoinTable = joinTableList.Count > 0,
             HasDictField = tableFieldList.Any(u => u.EffectType == "DictSelector"),
             HasDictField = tableFieldList.Any(u => u.EffectType == "DictSelector"),
@@ -490,7 +489,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
         }
         }
         return (tableFieldList, result);
         return (tableFieldList, result);
     }
     }
-    
+
     /// <summary>
     /// <summary>
     /// 添加或更新菜单
     /// 添加或更新菜单
     /// </summary>
     /// </summary>

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/Dict/SysDictTypeService.cs

@@ -39,7 +39,7 @@ public class SysDictTypeService : IDynamicApiController, ITransient
             .WhereIF(!_userManager.SuperAdmin, u => u.IsTenant == YesNoEnum.Y)
             .WhereIF(!_userManager.SuperAdmin, u => u.IsTenant == YesNoEnum.Y)
             .WhereIF(!string.IsNullOrEmpty(input.Code?.Trim()), u => u.Code.Contains(input.Code))
             .WhereIF(!string.IsNullOrEmpty(input.Code?.Trim()), u => u.Code.Contains(input.Code))
             .WhereIF(!string.IsNullOrEmpty(input.Name?.Trim()), u => u.Name.Contains(input.Name));
             .WhereIF(!string.IsNullOrEmpty(input.Name?.Trim()), u => u.Name.Contains(input.Name));
-            //.OrderBy(u => new { u.OrderNo, u.Code })
+        //.OrderBy(u => new { u.OrderNo, u.Code })
         return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize);
         return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize);
     }
     }
 
 

+ 3 - 1
Admin.NET/Admin.NET.Core/Service/User/SysUserService.cs

@@ -278,15 +278,17 @@ public class SysUserService : IDynamicApiController, ITransient
     {
     {
         return await _sysUserRep.AsQueryable().ClearFilter().FirstAsync(c => c.Id == _userManager.UserId);
         return await _sysUserRep.AsQueryable().ClearFilter().FirstAsync(c => c.Id == _userManager.UserId);
     }
     }
+
     /// <summary>
     /// <summary>
     /// 查询用户组织机构信息 🔖
     /// 查询用户组织机构信息 🔖
     /// </summary>
     /// </summary>
     /// <returns></returns>
     /// <returns></returns>
-    [DisplayName("查询用户组织机构信息")] 
+    [DisplayName("查询用户组织机构信息")]
     public virtual async Task<List<SysOrg>> GetOrgInfo()
     public virtual async Task<List<SysOrg>> GetOrgInfo()
     {
     {
         return await _sysOrgService.GetList(new OrgInput { Id = 0 });
         return await _sysOrgService.GetList(new OrgInput { Id = 0 });
     }
     }
+
     /// <summary>
     /// <summary>
     /// 更新用户基本信息 🔖
     /// 更新用户基本信息 🔖
     /// </summary>
     /// </summary>

+ 1 - 1
Admin.NET/Admin.NET.Test/Admin.NET.Test.csproj

@@ -12,7 +12,7 @@
     </PropertyGroup>
     </PropertyGroup>
 
 
     <ItemGroup>
     <ItemGroup>
-      <PackageReference Include="Furion.Xunit" Version="4.9.7.93" />
+      <PackageReference Include="Furion.Xunit" Version="4.9.7.96" />
       <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
       <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
       <PackageReference Include="Selenium.Support" Version="4.34.0" />
       <PackageReference Include="Selenium.Support" Version="4.34.0" />
       <PackageReference Include="Selenium.WebDriver" Version="4.34.0" />
       <PackageReference Include="Selenium.WebDriver" Version="4.34.0" />

+ 1 - 1
Admin.NET/Admin.NET.Web.Core/Admin.NET.Web.Core.csproj

@@ -11,7 +11,7 @@
 
 
   <ItemGroup>
   <ItemGroup>
     <PackageReference Include="IGeekFan.AspNetCore.Knife4jUI" Version="0.0.16" />
     <PackageReference Include="IGeekFan.AspNetCore.Knife4jUI" Version="0.0.16" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.6" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" Version="9.0.7" />
   </ItemGroup>
   </ItemGroup>
 
 
   <ItemGroup>
   <ItemGroup>

+ 4 - 4
Web/api_build/build.bat

@@ -18,15 +18,15 @@ if "%1"=="approvalFlow" (
 ) else if "%1"=="goView" (
 ) else if "%1"=="goView" (
   set moduleName=goView
   set moduleName=goView
   set apiServicesPath=%dir%..\src\api-plugins\goView\
   set apiServicesPath=%dir%..\src\api-plugins\goView\
-  set apiUrl=http://localhost:5005/swagger/GoView/swagger.json
+  set apiUrl=http://localhost:5005/swagger/GoView%%20%%E5%%A4%%A7%%E5%%B1%%8F%%E5%%8F%%AF%%E8%%A7%%86%%E5%%8C%%96/swagger.json
 )
 )
 
 
 if exist %apiServicesPath% (
 if exist %apiServicesPath% (
-    echo "================================ 删除目录 %apiServicesPath% ================================"
+    echo ================================ 删除目录 %moduleName% ================================
     rd /s /q %apiServicesPath%
     rd /s /q %apiServicesPath%
 )
 )
 
 
-echo "================================ 开始生成 %moduleName% ================================"
+echo ================================ 开始生成 %moduleName% ================================
 
 
 java -jar %dir%swagger-codegen-cli.jar generate -i %apiUrl% -l typescript-axios -o %apiServicesPath%
 java -jar %dir%swagger-codegen-cli.jar generate -i %apiUrl% -l typescript-axios -o %apiServicesPath%
 
 
@@ -40,4 +40,4 @@ del /q %apiServicesPath%package.json
 del /q %apiServicesPath%README.md
 del /q %apiServicesPath%README.md
 del /q %apiServicesPath%tsconfig.json
 del /q %apiServicesPath%tsconfig.json
 
 
-echo "================================ 生成结束 ================================"
+echo ================================ 生成结束 ================================

+ 8 - 8
Web/package.json

@@ -2,7 +2,7 @@
 	"name": "admin.net",
 	"name": "admin.net",
 	"type": "module",
 	"type": "module",
 	"version": "2.4.33",
 	"version": "2.4.33",
-	"lastBuildTime": "2025.07.06",
+	"lastBuildTime": "2025.07.12",
 	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
 	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
 	"author": "zuohuaijun",
 	"author": "zuohuaijun",
 	"license": "MIT",
 	"license": "MIT",
@@ -36,7 +36,7 @@
 		"echarts": "^5.6.0",
 		"echarts": "^5.6.0",
 		"echarts-gl": "^2.0.9",
 		"echarts-gl": "^2.0.9",
 		"echarts-wordcloud": "^2.1.0",
 		"echarts-wordcloud": "^2.1.0",
-		"element-plus": "^2.10.3",
+		"element-plus": "^2.10.4",
 		"ezuikit-js": "^8.1.12-beta.1",
 		"ezuikit-js": "^8.1.12-beta.1",
 		"js-cookie": "^3.0.5",
 		"js-cookie": "^3.0.5",
 		"js-table2excel": "^1.1.2",
 		"js-table2excel": "^1.1.2",
@@ -46,7 +46,7 @@
 		"md-editor-v3": "^5.7.1",
 		"md-editor-v3": "^5.7.1",
 		"mitt": "^3.0.1",
 		"mitt": "^3.0.1",
 		"monaco-editor": "^0.52.2",
 		"monaco-editor": "^0.52.2",
-		"mqtt": "^5.13.1",
+		"mqtt": "^5.13.2",
 		"nprogress": "^0.2.0",
 		"nprogress": "^0.2.0",
 		"pinia": "^3.0.3",
 		"pinia": "^3.0.3",
 		"print-js": "^1.6.0",
 		"print-js": "^1.6.0",
@@ -75,19 +75,19 @@
 	},
 	},
 	"devDependencies": {
 	"devDependencies": {
 		"@eslint/eslintrc": "^3.3.1",
 		"@eslint/eslintrc": "^3.3.1",
-		"@eslint/js": "^9.30.1",
+		"@eslint/js": "^9.31.0",
 		"@plugin-web-update-notification/vite": "^2.0.0",
 		"@plugin-web-update-notification/vite": "^2.0.0",
 		"@types/lodash-es": "^4.17.12",
 		"@types/lodash-es": "^4.17.12",
 		"@types/node": "^22.15.35",
 		"@types/node": "^22.15.35",
 		"@types/nprogress": "^0.2.3",
 		"@types/nprogress": "^0.2.3",
 		"@types/sortablejs": "^1.15.8",
 		"@types/sortablejs": "^1.15.8",
-		"@typescript-eslint/eslint-plugin": "^8.35.1",
-		"@typescript-eslint/parser": "^8.35.1",
+		"@typescript-eslint/eslint-plugin": "^8.36.0",
+		"@typescript-eslint/parser": "^8.36.0",
 		"@vitejs/plugin-vue": "^6.0.0",
 		"@vitejs/plugin-vue": "^6.0.0",
 		"@vitejs/plugin-vue-jsx": "^5.0.1",
 		"@vitejs/plugin-vue-jsx": "^5.0.1",
 		"@vue/compiler-sfc": "^3.5.17",
 		"@vue/compiler-sfc": "^3.5.17",
 		"code-inspector-plugin": "^0.20.15",
 		"code-inspector-plugin": "^0.20.15",
-		"eslint": "^9.30.1",
+		"eslint": "^9.31.0",
 		"eslint-plugin-vue": "^10.3.0",
 		"eslint-plugin-vue": "^10.3.0",
 		"globals": "^16.3.0",
 		"globals": "^16.3.0",
 		"less": "^4.3.0",
 		"less": "^4.3.0",
@@ -96,7 +96,7 @@
 		"sass": "^1.89.2",
 		"sass": "^1.89.2",
 		"terser": "^5.43.1",
 		"terser": "^5.43.1",
 		"typescript": "^5.8.3",
 		"typescript": "^5.8.3",
-		"vite": "^7.0.2",
+		"vite": "^7.0.4",
 		"vite-plugin-cdn-import": "^1.0.1",
 		"vite-plugin-cdn-import": "^1.0.1",
 		"vite-plugin-compression2": "^2.2.0",
 		"vite-plugin-compression2": "^2.2.0",
 		"vite-plugin-vue-setup-extend": "^0.4.0",
 		"vite-plugin-vue-setup-extend": "^0.4.0",

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

@@ -39,6 +39,7 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
          * @param {string} [columnComment] 字段描述
          * @param {string} [columnComment] 字段描述
          * @param {string} [netType] .NET类型
          * @param {string} [netType] .NET类型
          * @param {string} [dataType] 数据库中类型(物理类型)
          * @param {string} [dataType] 数据库中类型(物理类型)
+         * @param {string} [defaultValue] 字段数据默认值
          * @param {string} [nullableNetType] 可空.NET类型
          * @param {string} [nullableNetType] 可空.NET类型
          * @param {string} [effectType] 作用类型(字典)
          * @param {string} [effectType] 作用类型(字典)
          * @param {string} [fkConfigId] 外键库标识
          * @param {string} [fkConfigId] 外键库标识
@@ -70,7 +71,7 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
          * @param {*} [options] Override http request option.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          * @throws {RequiredError}
          */
          */
-        apiSysCodeGenConfigDetailGet: async (id?: number, codeGenId?: number, columnName?: string, columnKey?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, dataType?: string, nullableNetType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkLinkColumnName?: string, fkDisplayColumns?: string, fkDisplayColumnList?: Array<string>, lowerFkDisplayColumnsList?: Array<string>, fkColumnNetType?: string, pidColumn?: string, dictTypeCode?: string, queryType?: string, whetherQuery?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, whetherTable?: string, whetherAddUpdate?: string, whetherImport?: string, whetherCommon?: string, orderNo?: number, isSelectorEffectType?: boolean, propertyNameTrimEndId?: string, lowerPropertyNameTrimEndId?: string, extendedPropertyName?: string, lowerExtendedPropertyName?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        apiSysCodeGenConfigDetailGet: async (id?: number, codeGenId?: number, columnName?: string, columnKey?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, dataType?: string, defaultValue?: string, nullableNetType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkLinkColumnName?: string, fkDisplayColumns?: string, fkDisplayColumnList?: Array<string>, lowerFkDisplayColumnsList?: Array<string>, fkColumnNetType?: string, pidColumn?: string, dictTypeCode?: string, queryType?: string, whetherQuery?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, whetherTable?: string, whetherAddUpdate?: string, whetherImport?: string, whetherCommon?: string, orderNo?: number, isSelectorEffectType?: boolean, propertyNameTrimEndId?: string, lowerPropertyNameTrimEndId?: string, extendedPropertyName?: string, lowerExtendedPropertyName?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/api/sysCodeGenConfig/detail`;
             const localVarPath = `/api/sysCodeGenConfig/detail`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
@@ -131,6 +132,10 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
                 localVarQueryParameter['DataType'] = dataType;
                 localVarQueryParameter['DataType'] = dataType;
             }
             }
 
 
+            if (defaultValue !== undefined) {
+                localVarQueryParameter['DefaultValue'] = defaultValue;
+            }
+
             if (nullableNetType !== undefined) {
             if (nullableNetType !== undefined) {
                 localVarQueryParameter['NullableNetType'] = nullableNetType;
                 localVarQueryParameter['NullableNetType'] = nullableNetType;
             }
             }
@@ -272,6 +277,7 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
          * @param {string} [columnComment] 字段描述
          * @param {string} [columnComment] 字段描述
          * @param {string} [netType] .NET类型
          * @param {string} [netType] .NET类型
          * @param {string} [dataType] 数据库中类型(物理类型)
          * @param {string} [dataType] 数据库中类型(物理类型)
+         * @param {string} [defaultValue] 字段数据默认值
          * @param {string} [nullableNetType] 可空.NET类型
          * @param {string} [nullableNetType] 可空.NET类型
          * @param {string} [effectType] 作用类型(字典)
          * @param {string} [effectType] 作用类型(字典)
          * @param {string} [fkConfigId] 外键库标识
          * @param {string} [fkConfigId] 外键库标识
@@ -303,7 +309,7 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
          * @param {*} [options] Override http request option.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          * @throws {RequiredError}
          */
          */
-        apiSysCodeGenConfigListGet: async (id?: number, codeGenId?: number, columnName?: string, columnKey?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, dataType?: string, nullableNetType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkLinkColumnName?: string, fkDisplayColumns?: string, fkDisplayColumnList?: Array<string>, lowerFkDisplayColumnsList?: Array<string>, fkColumnNetType?: string, pidColumn?: string, dictTypeCode?: string, queryType?: string, whetherQuery?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, whetherTable?: string, whetherAddUpdate?: string, whetherImport?: string, whetherCommon?: string, orderNo?: number, isSelectorEffectType?: boolean, propertyNameTrimEndId?: string, lowerPropertyNameTrimEndId?: string, extendedPropertyName?: string, lowerExtendedPropertyName?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        apiSysCodeGenConfigListGet: async (id?: number, codeGenId?: number, columnName?: string, columnKey?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, dataType?: string, defaultValue?: string, nullableNetType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkLinkColumnName?: string, fkDisplayColumns?: string, fkDisplayColumnList?: Array<string>, lowerFkDisplayColumnsList?: Array<string>, fkColumnNetType?: string, pidColumn?: string, dictTypeCode?: string, queryType?: string, whetherQuery?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, whetherTable?: string, whetherAddUpdate?: string, whetherImport?: string, whetherCommon?: string, orderNo?: number, isSelectorEffectType?: boolean, propertyNameTrimEndId?: string, lowerPropertyNameTrimEndId?: string, extendedPropertyName?: string, lowerExtendedPropertyName?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/api/sysCodeGenConfig/list`;
             const localVarPath = `/api/sysCodeGenConfig/list`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
             const localVarUrlObj = new URL(localVarPath, 'https://example.com');
@@ -364,6 +370,10 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
                 localVarQueryParameter['DataType'] = dataType;
                 localVarQueryParameter['DataType'] = dataType;
             }
             }
 
 
+            if (defaultValue !== undefined) {
+                localVarQueryParameter['DefaultValue'] = defaultValue;
+            }
+
             if (nullableNetType !== undefined) {
             if (nullableNetType !== undefined) {
                 localVarQueryParameter['NullableNetType'] = nullableNetType;
                 localVarQueryParameter['NullableNetType'] = nullableNetType;
             }
             }
@@ -562,6 +572,7 @@ export const SysCodeGenConfigApiFp = function(configuration?: Configuration) {
          * @param {string} [columnComment] 字段描述
          * @param {string} [columnComment] 字段描述
          * @param {string} [netType] .NET类型
          * @param {string} [netType] .NET类型
          * @param {string} [dataType] 数据库中类型(物理类型)
          * @param {string} [dataType] 数据库中类型(物理类型)
+         * @param {string} [defaultValue] 字段数据默认值
          * @param {string} [nullableNetType] 可空.NET类型
          * @param {string} [nullableNetType] 可空.NET类型
          * @param {string} [effectType] 作用类型(字典)
          * @param {string} [effectType] 作用类型(字典)
          * @param {string} [fkConfigId] 外键库标识
          * @param {string} [fkConfigId] 外键库标识
@@ -593,8 +604,8 @@ export const SysCodeGenConfigApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          * @throws {RequiredError}
          */
          */
-        async apiSysCodeGenConfigDetailGet(id?: number, codeGenId?: number, columnName?: string, columnKey?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, dataType?: string, nullableNetType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkLinkColumnName?: string, fkDisplayColumns?: string, fkDisplayColumnList?: Array<string>, lowerFkDisplayColumnsList?: Array<string>, fkColumnNetType?: string, pidColumn?: string, dictTypeCode?: string, queryType?: string, whetherQuery?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, whetherTable?: string, whetherAddUpdate?: string, whetherImport?: string, whetherCommon?: string, orderNo?: number, isSelectorEffectType?: boolean, propertyNameTrimEndId?: string, lowerPropertyNameTrimEndId?: string, extendedPropertyName?: string, lowerExtendedPropertyName?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultSysCodeGenConfig>>> {
-            const localVarAxiosArgs = await SysCodeGenConfigApiAxiosParamCreator(configuration).apiSysCodeGenConfigDetailGet(id, codeGenId, columnName, columnKey, propertyName, columnLength, lowerPropertyName, columnComment, netType, dataType, nullableNetType, effectType, fkConfigId, fkEntityName, fkTableName, lowerFkEntityName, fkLinkColumnName, fkDisplayColumns, fkDisplayColumnList, lowerFkDisplayColumnsList, fkColumnNetType, pidColumn, dictTypeCode, queryType, whetherQuery, whetherRetract, whetherRequired, whetherSortable, whetherTable, whetherAddUpdate, whetherImport, whetherCommon, orderNo, isSelectorEffectType, propertyNameTrimEndId, lowerPropertyNameTrimEndId, extendedPropertyName, lowerExtendedPropertyName, options);
+        async apiSysCodeGenConfigDetailGet(id?: number, codeGenId?: number, columnName?: string, columnKey?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, dataType?: string, defaultValue?: string, nullableNetType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkLinkColumnName?: string, fkDisplayColumns?: string, fkDisplayColumnList?: Array<string>, lowerFkDisplayColumnsList?: Array<string>, fkColumnNetType?: string, pidColumn?: string, dictTypeCode?: string, queryType?: string, whetherQuery?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, whetherTable?: string, whetherAddUpdate?: string, whetherImport?: string, whetherCommon?: string, orderNo?: number, isSelectorEffectType?: boolean, propertyNameTrimEndId?: string, lowerPropertyNameTrimEndId?: string, extendedPropertyName?: string, lowerExtendedPropertyName?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultSysCodeGenConfig>>> {
+            const localVarAxiosArgs = await SysCodeGenConfigApiAxiosParamCreator(configuration).apiSysCodeGenConfigDetailGet(id, codeGenId, columnName, columnKey, propertyName, columnLength, lowerPropertyName, columnComment, netType, dataType, defaultValue, nullableNetType, effectType, fkConfigId, fkEntityName, fkTableName, lowerFkEntityName, fkLinkColumnName, fkDisplayColumns, fkDisplayColumnList, lowerFkDisplayColumnsList, fkColumnNetType, pidColumn, dictTypeCode, queryType, whetherQuery, whetherRetract, whetherRequired, whetherSortable, whetherTable, whetherAddUpdate, whetherImport, whetherCommon, orderNo, isSelectorEffectType, propertyNameTrimEndId, lowerPropertyNameTrimEndId, extendedPropertyName, lowerExtendedPropertyName, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
                 return axios.request(axiosRequestArgs);
@@ -613,6 +624,7 @@ export const SysCodeGenConfigApiFp = function(configuration?: Configuration) {
          * @param {string} [columnComment] 字段描述
          * @param {string} [columnComment] 字段描述
          * @param {string} [netType] .NET类型
          * @param {string} [netType] .NET类型
          * @param {string} [dataType] 数据库中类型(物理类型)
          * @param {string} [dataType] 数据库中类型(物理类型)
+         * @param {string} [defaultValue] 字段数据默认值
          * @param {string} [nullableNetType] 可空.NET类型
          * @param {string} [nullableNetType] 可空.NET类型
          * @param {string} [effectType] 作用类型(字典)
          * @param {string} [effectType] 作用类型(字典)
          * @param {string} [fkConfigId] 外键库标识
          * @param {string} [fkConfigId] 外键库标识
@@ -644,8 +656,8 @@ export const SysCodeGenConfigApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          * @throws {RequiredError}
          */
          */
-        async apiSysCodeGenConfigListGet(id?: number, codeGenId?: number, columnName?: string, columnKey?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, dataType?: string, nullableNetType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkLinkColumnName?: string, fkDisplayColumns?: string, fkDisplayColumnList?: Array<string>, lowerFkDisplayColumnsList?: Array<string>, fkColumnNetType?: string, pidColumn?: string, dictTypeCode?: string, queryType?: string, whetherQuery?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, whetherTable?: string, whetherAddUpdate?: string, whetherImport?: string, whetherCommon?: string, orderNo?: number, isSelectorEffectType?: boolean, propertyNameTrimEndId?: string, lowerPropertyNameTrimEndId?: string, extendedPropertyName?: string, lowerExtendedPropertyName?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListCodeGenConfig>>> {
-            const localVarAxiosArgs = await SysCodeGenConfigApiAxiosParamCreator(configuration).apiSysCodeGenConfigListGet(id, codeGenId, columnName, columnKey, propertyName, columnLength, lowerPropertyName, columnComment, netType, dataType, nullableNetType, effectType, fkConfigId, fkEntityName, fkTableName, lowerFkEntityName, fkLinkColumnName, fkDisplayColumns, fkDisplayColumnList, lowerFkDisplayColumnsList, fkColumnNetType, pidColumn, dictTypeCode, queryType, whetherQuery, whetherRetract, whetherRequired, whetherSortable, whetherTable, whetherAddUpdate, whetherImport, whetherCommon, orderNo, isSelectorEffectType, propertyNameTrimEndId, lowerPropertyNameTrimEndId, extendedPropertyName, lowerExtendedPropertyName, options);
+        async apiSysCodeGenConfigListGet(id?: number, codeGenId?: number, columnName?: string, columnKey?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, dataType?: string, defaultValue?: string, nullableNetType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkLinkColumnName?: string, fkDisplayColumns?: string, fkDisplayColumnList?: Array<string>, lowerFkDisplayColumnsList?: Array<string>, fkColumnNetType?: string, pidColumn?: string, dictTypeCode?: string, queryType?: string, whetherQuery?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, whetherTable?: string, whetherAddUpdate?: string, whetherImport?: string, whetherCommon?: string, orderNo?: number, isSelectorEffectType?: boolean, propertyNameTrimEndId?: string, lowerPropertyNameTrimEndId?: string, extendedPropertyName?: string, lowerExtendedPropertyName?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListCodeGenConfig>>> {
+            const localVarAxiosArgs = await SysCodeGenConfigApiAxiosParamCreator(configuration).apiSysCodeGenConfigListGet(id, codeGenId, columnName, columnKey, propertyName, columnLength, lowerPropertyName, columnComment, netType, dataType, defaultValue, nullableNetType, effectType, fkConfigId, fkEntityName, fkTableName, lowerFkEntityName, fkLinkColumnName, fkDisplayColumns, fkDisplayColumnList, lowerFkDisplayColumnsList, fkColumnNetType, pidColumn, dictTypeCode, queryType, whetherQuery, whetherRetract, whetherRequired, whetherSortable, whetherTable, whetherAddUpdate, whetherImport, whetherCommon, orderNo, isSelectorEffectType, propertyNameTrimEndId, lowerPropertyNameTrimEndId, extendedPropertyName, lowerExtendedPropertyName, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
                 return axios.request(axiosRequestArgs);
@@ -687,6 +699,7 @@ export const SysCodeGenConfigApiFactory = function (configuration?: Configuratio
          * @param {string} [columnComment] 字段描述
          * @param {string} [columnComment] 字段描述
          * @param {string} [netType] .NET类型
          * @param {string} [netType] .NET类型
          * @param {string} [dataType] 数据库中类型(物理类型)
          * @param {string} [dataType] 数据库中类型(物理类型)
+         * @param {string} [defaultValue] 字段数据默认值
          * @param {string} [nullableNetType] 可空.NET类型
          * @param {string} [nullableNetType] 可空.NET类型
          * @param {string} [effectType] 作用类型(字典)
          * @param {string} [effectType] 作用类型(字典)
          * @param {string} [fkConfigId] 外键库标识
          * @param {string} [fkConfigId] 外键库标识
@@ -718,8 +731,8 @@ export const SysCodeGenConfigApiFactory = function (configuration?: Configuratio
          * @param {*} [options] Override http request option.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          * @throws {RequiredError}
          */
          */
-        async apiSysCodeGenConfigDetailGet(id?: number, codeGenId?: number, columnName?: string, columnKey?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, dataType?: string, nullableNetType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkLinkColumnName?: string, fkDisplayColumns?: string, fkDisplayColumnList?: Array<string>, lowerFkDisplayColumnsList?: Array<string>, fkColumnNetType?: string, pidColumn?: string, dictTypeCode?: string, queryType?: string, whetherQuery?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, whetherTable?: string, whetherAddUpdate?: string, whetherImport?: string, whetherCommon?: string, orderNo?: number, isSelectorEffectType?: boolean, propertyNameTrimEndId?: string, lowerPropertyNameTrimEndId?: string, extendedPropertyName?: string, lowerExtendedPropertyName?: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultSysCodeGenConfig>> {
-            return SysCodeGenConfigApiFp(configuration).apiSysCodeGenConfigDetailGet(id, codeGenId, columnName, columnKey, propertyName, columnLength, lowerPropertyName, columnComment, netType, dataType, nullableNetType, effectType, fkConfigId, fkEntityName, fkTableName, lowerFkEntityName, fkLinkColumnName, fkDisplayColumns, fkDisplayColumnList, lowerFkDisplayColumnsList, fkColumnNetType, pidColumn, dictTypeCode, queryType, whetherQuery, whetherRetract, whetherRequired, whetherSortable, whetherTable, whetherAddUpdate, whetherImport, whetherCommon, orderNo, isSelectorEffectType, propertyNameTrimEndId, lowerPropertyNameTrimEndId, extendedPropertyName, lowerExtendedPropertyName, options).then((request) => request(axios, basePath));
+        async apiSysCodeGenConfigDetailGet(id?: number, codeGenId?: number, columnName?: string, columnKey?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, dataType?: string, defaultValue?: string, nullableNetType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkLinkColumnName?: string, fkDisplayColumns?: string, fkDisplayColumnList?: Array<string>, lowerFkDisplayColumnsList?: Array<string>, fkColumnNetType?: string, pidColumn?: string, dictTypeCode?: string, queryType?: string, whetherQuery?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, whetherTable?: string, whetherAddUpdate?: string, whetherImport?: string, whetherCommon?: string, orderNo?: number, isSelectorEffectType?: boolean, propertyNameTrimEndId?: string, lowerPropertyNameTrimEndId?: string, extendedPropertyName?: string, lowerExtendedPropertyName?: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultSysCodeGenConfig>> {
+            return SysCodeGenConfigApiFp(configuration).apiSysCodeGenConfigDetailGet(id, codeGenId, columnName, columnKey, propertyName, columnLength, lowerPropertyName, columnComment, netType, dataType, defaultValue, nullableNetType, effectType, fkConfigId, fkEntityName, fkTableName, lowerFkEntityName, fkLinkColumnName, fkDisplayColumns, fkDisplayColumnList, lowerFkDisplayColumnsList, fkColumnNetType, pidColumn, dictTypeCode, queryType, whetherQuery, whetherRetract, whetherRequired, whetherSortable, whetherTable, whetherAddUpdate, whetherImport, whetherCommon, orderNo, isSelectorEffectType, propertyNameTrimEndId, lowerPropertyNameTrimEndId, extendedPropertyName, lowerExtendedPropertyName, options).then((request) => request(axios, basePath));
         },
         },
         /**
         /**
          * 
          * 
@@ -734,6 +747,7 @@ export const SysCodeGenConfigApiFactory = function (configuration?: Configuratio
          * @param {string} [columnComment] 字段描述
          * @param {string} [columnComment] 字段描述
          * @param {string} [netType] .NET类型
          * @param {string} [netType] .NET类型
          * @param {string} [dataType] 数据库中类型(物理类型)
          * @param {string} [dataType] 数据库中类型(物理类型)
+         * @param {string} [defaultValue] 字段数据默认值
          * @param {string} [nullableNetType] 可空.NET类型
          * @param {string} [nullableNetType] 可空.NET类型
          * @param {string} [effectType] 作用类型(字典)
          * @param {string} [effectType] 作用类型(字典)
          * @param {string} [fkConfigId] 外键库标识
          * @param {string} [fkConfigId] 外键库标识
@@ -765,8 +779,8 @@ export const SysCodeGenConfigApiFactory = function (configuration?: Configuratio
          * @param {*} [options] Override http request option.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          * @throws {RequiredError}
          */
          */
-        async apiSysCodeGenConfigListGet(id?: number, codeGenId?: number, columnName?: string, columnKey?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, dataType?: string, nullableNetType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkLinkColumnName?: string, fkDisplayColumns?: string, fkDisplayColumnList?: Array<string>, lowerFkDisplayColumnsList?: Array<string>, fkColumnNetType?: string, pidColumn?: string, dictTypeCode?: string, queryType?: string, whetherQuery?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, whetherTable?: string, whetherAddUpdate?: string, whetherImport?: string, whetherCommon?: string, orderNo?: number, isSelectorEffectType?: boolean, propertyNameTrimEndId?: string, lowerPropertyNameTrimEndId?: string, extendedPropertyName?: string, lowerExtendedPropertyName?: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListCodeGenConfig>> {
-            return SysCodeGenConfigApiFp(configuration).apiSysCodeGenConfigListGet(id, codeGenId, columnName, columnKey, propertyName, columnLength, lowerPropertyName, columnComment, netType, dataType, nullableNetType, effectType, fkConfigId, fkEntityName, fkTableName, lowerFkEntityName, fkLinkColumnName, fkDisplayColumns, fkDisplayColumnList, lowerFkDisplayColumnsList, fkColumnNetType, pidColumn, dictTypeCode, queryType, whetherQuery, whetherRetract, whetherRequired, whetherSortable, whetherTable, whetherAddUpdate, whetherImport, whetherCommon, orderNo, isSelectorEffectType, propertyNameTrimEndId, lowerPropertyNameTrimEndId, extendedPropertyName, lowerExtendedPropertyName, options).then((request) => request(axios, basePath));
+        async apiSysCodeGenConfigListGet(id?: number, codeGenId?: number, columnName?: string, columnKey?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, dataType?: string, defaultValue?: string, nullableNetType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkLinkColumnName?: string, fkDisplayColumns?: string, fkDisplayColumnList?: Array<string>, lowerFkDisplayColumnsList?: Array<string>, fkColumnNetType?: string, pidColumn?: string, dictTypeCode?: string, queryType?: string, whetherQuery?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, whetherTable?: string, whetherAddUpdate?: string, whetherImport?: string, whetherCommon?: string, orderNo?: number, isSelectorEffectType?: boolean, propertyNameTrimEndId?: string, lowerPropertyNameTrimEndId?: string, extendedPropertyName?: string, lowerExtendedPropertyName?: string, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListCodeGenConfig>> {
+            return SysCodeGenConfigApiFp(configuration).apiSysCodeGenConfigListGet(id, codeGenId, columnName, columnKey, propertyName, columnLength, lowerPropertyName, columnComment, netType, dataType, defaultValue, nullableNetType, effectType, fkConfigId, fkEntityName, fkTableName, lowerFkEntityName, fkLinkColumnName, fkDisplayColumns, fkDisplayColumnList, lowerFkDisplayColumnsList, fkColumnNetType, pidColumn, dictTypeCode, queryType, whetherQuery, whetherRetract, whetherRequired, whetherSortable, whetherTable, whetherAddUpdate, whetherImport, whetherCommon, orderNo, isSelectorEffectType, propertyNameTrimEndId, lowerPropertyNameTrimEndId, extendedPropertyName, lowerExtendedPropertyName, options).then((request) => request(axios, basePath));
         },
         },
         /**
         /**
          * 
          * 
@@ -801,6 +815,7 @@ export class SysCodeGenConfigApi extends BaseAPI {
      * @param {string} [columnComment] 字段描述
      * @param {string} [columnComment] 字段描述
      * @param {string} [netType] .NET类型
      * @param {string} [netType] .NET类型
      * @param {string} [dataType] 数据库中类型(物理类型)
      * @param {string} [dataType] 数据库中类型(物理类型)
+     * @param {string} [defaultValue] 字段数据默认值
      * @param {string} [nullableNetType] 可空.NET类型
      * @param {string} [nullableNetType] 可空.NET类型
      * @param {string} [effectType] 作用类型(字典)
      * @param {string} [effectType] 作用类型(字典)
      * @param {string} [fkConfigId] 外键库标识
      * @param {string} [fkConfigId] 外键库标识
@@ -833,8 +848,8 @@ export class SysCodeGenConfigApi extends BaseAPI {
      * @throws {RequiredError}
      * @throws {RequiredError}
      * @memberof SysCodeGenConfigApi
      * @memberof SysCodeGenConfigApi
      */
      */
-    public async apiSysCodeGenConfigDetailGet(id?: number, codeGenId?: number, columnName?: string, columnKey?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, dataType?: string, nullableNetType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkLinkColumnName?: string, fkDisplayColumns?: string, fkDisplayColumnList?: Array<string>, lowerFkDisplayColumnsList?: Array<string>, fkColumnNetType?: string, pidColumn?: string, dictTypeCode?: string, queryType?: string, whetherQuery?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, whetherTable?: string, whetherAddUpdate?: string, whetherImport?: string, whetherCommon?: string, orderNo?: number, isSelectorEffectType?: boolean, propertyNameTrimEndId?: string, lowerPropertyNameTrimEndId?: string, extendedPropertyName?: string, lowerExtendedPropertyName?: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultSysCodeGenConfig>> {
-        return SysCodeGenConfigApiFp(this.configuration).apiSysCodeGenConfigDetailGet(id, codeGenId, columnName, columnKey, propertyName, columnLength, lowerPropertyName, columnComment, netType, dataType, nullableNetType, effectType, fkConfigId, fkEntityName, fkTableName, lowerFkEntityName, fkLinkColumnName, fkDisplayColumns, fkDisplayColumnList, lowerFkDisplayColumnsList, fkColumnNetType, pidColumn, dictTypeCode, queryType, whetherQuery, whetherRetract, whetherRequired, whetherSortable, whetherTable, whetherAddUpdate, whetherImport, whetherCommon, orderNo, isSelectorEffectType, propertyNameTrimEndId, lowerPropertyNameTrimEndId, extendedPropertyName, lowerExtendedPropertyName, options).then((request) => request(this.axios, this.basePath));
+    public async apiSysCodeGenConfigDetailGet(id?: number, codeGenId?: number, columnName?: string, columnKey?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, dataType?: string, defaultValue?: string, nullableNetType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkLinkColumnName?: string, fkDisplayColumns?: string, fkDisplayColumnList?: Array<string>, lowerFkDisplayColumnsList?: Array<string>, fkColumnNetType?: string, pidColumn?: string, dictTypeCode?: string, queryType?: string, whetherQuery?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, whetherTable?: string, whetherAddUpdate?: string, whetherImport?: string, whetherCommon?: string, orderNo?: number, isSelectorEffectType?: boolean, propertyNameTrimEndId?: string, lowerPropertyNameTrimEndId?: string, extendedPropertyName?: string, lowerExtendedPropertyName?: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultSysCodeGenConfig>> {
+        return SysCodeGenConfigApiFp(this.configuration).apiSysCodeGenConfigDetailGet(id, codeGenId, columnName, columnKey, propertyName, columnLength, lowerPropertyName, columnComment, netType, dataType, defaultValue, nullableNetType, effectType, fkConfigId, fkEntityName, fkTableName, lowerFkEntityName, fkLinkColumnName, fkDisplayColumns, fkDisplayColumnList, lowerFkDisplayColumnsList, fkColumnNetType, pidColumn, dictTypeCode, queryType, whetherQuery, whetherRetract, whetherRequired, whetherSortable, whetherTable, whetherAddUpdate, whetherImport, whetherCommon, orderNo, isSelectorEffectType, propertyNameTrimEndId, lowerPropertyNameTrimEndId, extendedPropertyName, lowerExtendedPropertyName, options).then((request) => request(this.axios, this.basePath));
     }
     }
     /**
     /**
      * 
      * 
@@ -849,6 +864,7 @@ export class SysCodeGenConfigApi extends BaseAPI {
      * @param {string} [columnComment] 字段描述
      * @param {string} [columnComment] 字段描述
      * @param {string} [netType] .NET类型
      * @param {string} [netType] .NET类型
      * @param {string} [dataType] 数据库中类型(物理类型)
      * @param {string} [dataType] 数据库中类型(物理类型)
+     * @param {string} [defaultValue] 字段数据默认值
      * @param {string} [nullableNetType] 可空.NET类型
      * @param {string} [nullableNetType] 可空.NET类型
      * @param {string} [effectType] 作用类型(字典)
      * @param {string} [effectType] 作用类型(字典)
      * @param {string} [fkConfigId] 外键库标识
      * @param {string} [fkConfigId] 外键库标识
@@ -881,8 +897,8 @@ export class SysCodeGenConfigApi extends BaseAPI {
      * @throws {RequiredError}
      * @throws {RequiredError}
      * @memberof SysCodeGenConfigApi
      * @memberof SysCodeGenConfigApi
      */
      */
-    public async apiSysCodeGenConfigListGet(id?: number, codeGenId?: number, columnName?: string, columnKey?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, dataType?: string, nullableNetType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkLinkColumnName?: string, fkDisplayColumns?: string, fkDisplayColumnList?: Array<string>, lowerFkDisplayColumnsList?: Array<string>, fkColumnNetType?: string, pidColumn?: string, dictTypeCode?: string, queryType?: string, whetherQuery?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, whetherTable?: string, whetherAddUpdate?: string, whetherImport?: string, whetherCommon?: string, orderNo?: number, isSelectorEffectType?: boolean, propertyNameTrimEndId?: string, lowerPropertyNameTrimEndId?: string, extendedPropertyName?: string, lowerExtendedPropertyName?: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListCodeGenConfig>> {
-        return SysCodeGenConfigApiFp(this.configuration).apiSysCodeGenConfigListGet(id, codeGenId, columnName, columnKey, propertyName, columnLength, lowerPropertyName, columnComment, netType, dataType, nullableNetType, effectType, fkConfigId, fkEntityName, fkTableName, lowerFkEntityName, fkLinkColumnName, fkDisplayColumns, fkDisplayColumnList, lowerFkDisplayColumnsList, fkColumnNetType, pidColumn, dictTypeCode, queryType, whetherQuery, whetherRetract, whetherRequired, whetherSortable, whetherTable, whetherAddUpdate, whetherImport, whetherCommon, orderNo, isSelectorEffectType, propertyNameTrimEndId, lowerPropertyNameTrimEndId, extendedPropertyName, lowerExtendedPropertyName, options).then((request) => request(this.axios, this.basePath));
+    public async apiSysCodeGenConfigListGet(id?: number, codeGenId?: number, columnName?: string, columnKey?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, dataType?: string, defaultValue?: string, nullableNetType?: string, effectType?: string, fkConfigId?: string, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkLinkColumnName?: string, fkDisplayColumns?: string, fkDisplayColumnList?: Array<string>, lowerFkDisplayColumnsList?: Array<string>, fkColumnNetType?: string, pidColumn?: string, dictTypeCode?: string, queryType?: string, whetherQuery?: string, whetherRetract?: string, whetherRequired?: string, whetherSortable?: string, whetherTable?: string, whetherAddUpdate?: string, whetherImport?: string, whetherCommon?: string, orderNo?: number, isSelectorEffectType?: boolean, propertyNameTrimEndId?: string, lowerPropertyNameTrimEndId?: string, extendedPropertyName?: string, lowerExtendedPropertyName?: string, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListCodeGenConfig>> {
+        return SysCodeGenConfigApiFp(this.configuration).apiSysCodeGenConfigListGet(id, codeGenId, columnName, columnKey, propertyName, columnLength, lowerPropertyName, columnComment, netType, dataType, defaultValue, nullableNetType, effectType, fkConfigId, fkEntityName, fkTableName, lowerFkEntityName, fkLinkColumnName, fkDisplayColumns, fkDisplayColumnList, lowerFkDisplayColumnsList, fkColumnNetType, pidColumn, dictTypeCode, queryType, whetherQuery, whetherRetract, whetherRequired, whetherSortable, whetherTable, whetherAddUpdate, whetherImport, whetherCommon, orderNo, isSelectorEffectType, propertyNameTrimEndId, lowerPropertyNameTrimEndId, extendedPropertyName, lowerExtendedPropertyName, options).then((request) => request(this.axios, this.basePath));
     }
     }
     /**
     /**
      * 
      * 

+ 84 - 0
Web/src/api-services/apis/sys-database-api.ts

@@ -28,6 +28,7 @@ import { DbColumnInput } from '../models';
 import { DbTableInput } from '../models';
 import { DbTableInput } from '../models';
 import { DeleteDbColumnInput } from '../models';
 import { DeleteDbColumnInput } from '../models';
 import { DeleteDbTableInput } from '../models';
 import { DeleteDbTableInput } from '../models';
+import { MoveDbColumnInput } from '../models';
 import { UpdateDbColumnInput } from '../models';
 import { UpdateDbColumnInput } from '../models';
 import { UpdateDbTableInput } from '../models';
 import { UpdateDbTableInput } from '../models';
 /**
 /**
@@ -516,6 +517,54 @@ export const SysDatabaseApiAxiosParamCreator = function (configuration?: Configu
         },
         },
         /**
         /**
          * 
          * 
+         * @summary 移动列位置 🔖
+         * @param {MoveDbColumnInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiSysDatabaseMoveColumnPost: async (body?: MoveDbColumnInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/sysDatabase/moveColumn`;
+            // 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 获取表列表 🔖
          * @summary 获取表列表 🔖
          * @param {string} configId ConfigId
          * @param {string} configId ConfigId
          * @param {*} [options] Override http request option.
          * @param {*} [options] Override http request option.
@@ -852,6 +901,20 @@ export const SysDatabaseApiFp = function(configuration?: Configuration) {
         },
         },
         /**
         /**
          * 
          * 
+         * @summary 移动列位置 🔖
+         * @param {MoveDbColumnInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysDatabaseMoveColumnPost(body?: MoveDbColumnInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
+            const localVarAxiosArgs = await SysDatabaseApiAxiosParamCreator(configuration).apiSysDatabaseMoveColumnPost(body, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
+        /**
+         * 
          * @summary 获取表列表 🔖
          * @summary 获取表列表 🔖
          * @param {string} configId ConfigId
          * @param {string} configId ConfigId
          * @param {*} [options] Override http request option.
          * @param {*} [options] Override http request option.
@@ -1015,6 +1078,16 @@ export const SysDatabaseApiFactory = function (configuration?: Configuration, ba
         },
         },
         /**
         /**
          * 
          * 
+         * @summary 移动列位置 🔖
+         * @param {MoveDbColumnInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysDatabaseMoveColumnPost(body?: MoveDbColumnInput, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
+            return SysDatabaseApiFp(configuration).apiSysDatabaseMoveColumnPost(body, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
          * @summary 获取表列表 🔖
          * @summary 获取表列表 🔖
          * @param {string} configId ConfigId
          * @param {string} configId ConfigId
          * @param {*} [options] Override http request option.
          * @param {*} [options] Override http request option.
@@ -1173,6 +1246,17 @@ export class SysDatabaseApi extends BaseAPI {
     }
     }
     /**
     /**
      * 
      * 
+     * @summary 移动列位置 🔖
+     * @param {MoveDbColumnInput} [body] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof SysDatabaseApi
+     */
+    public async apiSysDatabaseMoveColumnPost(body?: MoveDbColumnInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
+        return SysDatabaseApiFp(this.configuration).apiSysDatabaseMoveColumnPost(body, options).then((request) => request(this.axios, this.basePath));
+    }
+    /**
+     * 
      * @summary 获取表列表 🔖
      * @summary 获取表列表 🔖
      * @param {string} configId ConfigId
      * @param {string} configId ConfigId
      * @param {*} [options] Override http request option.
      * @param {*} [options] Override http request option.

+ 78 - 67
Web/src/api-services/apis/sys-user-api.ts

@@ -1,8 +1,8 @@
 /* tslint:disable */
 /* tslint:disable */
 /* eslint-disable */
 /* eslint-disable */
 /**
 /**
-
- * 
+ * Admin.NET 通用权限开发平台
+ * 让 .NET 开发更简单、更通用、更流行。整合最新技术,模块插件式开发,前后端分离,开箱即用。<br/><u><b><font color='FF0000'> 👮不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!</font></b></u>
  *
  *
  * OpenAPI spec version: 1.0.0
  * OpenAPI spec version: 1.0.0
  * 
  * 
@@ -21,6 +21,7 @@ import { AddUserInput } from '../models';
 import { AdminResultInt32 } from '../models';
 import { AdminResultInt32 } from '../models';
 import { AdminResultInt64 } from '../models';
 import { AdminResultInt64 } from '../models';
 import { AdminResultListInt64 } from '../models';
 import { AdminResultListInt64 } from '../models';
+import { AdminResultListSysOrg } from '../models';
 import { AdminResultListSysUserExtOrg } from '../models';
 import { AdminResultListSysUserExtOrg } from '../models';
 import { AdminResultSqlSugarPagedListUserOutput } from '../models';
 import { AdminResultSqlSugarPagedListUserOutput } from '../models';
 import { AdminResultString } from '../models';
 import { AdminResultString } from '../models';
@@ -34,7 +35,6 @@ import { UnlockLoginInput } from '../models';
 import { UpdateUserInput } from '../models';
 import { UpdateUserInput } from '../models';
 import { UserInput } from '../models';
 import { UserInput } from '../models';
 import { UserRoleInput } from '../models';
 import { UserRoleInput } from '../models';
-import { AdminResultListSysOrg } from '../models';
 /**
 /**
  * SysUserApi - axios parameter creator
  * SysUserApi - axios parameter creator
  * @export
  * @export
@@ -134,48 +134,6 @@ export const SysUserApiAxiosParamCreator = function (configuration?: Configurati
         },
         },
         /**
         /**
          * 
          * 
-         * @summary 查询用户组织机构信息 🔖 
-         */
-      apiSysUserOrgInfoGet: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => { 
-                        const localVarPath = `/api/sysUser/orgInfo`; 
-                        // 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 更新用户基本信息 🔖
          * @summary 更新用户基本信息 🔖
          * @param {SysUser} [body] 
          * @param {SysUser} [body] 
          * @param {*} [options] Override http request option.
          * @param {*} [options] Override http request option.
@@ -368,6 +326,49 @@ export const SysUserApiAxiosParamCreator = function (configuration?: Configurati
         },
         },
         /**
         /**
          * 
          * 
+         * @summary 查询用户组织机构信息 🔖
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiSysUserOrgInfoGet: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/sysUser/orgInfo`;
+            // 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 获取用户扩展机构集合 🔖
          * @summary 获取用户扩展机构集合 🔖
          * @param {number} userId 
          * @param {number} userId 
          * @param {*} [options] Override http request option.
          * @param {*} [options] Override http request option.
@@ -740,19 +741,6 @@ export const SysUserApiFp = function(configuration?: Configuration) {
                 return axios.request(axiosRequestArgs);
                 return axios.request(axiosRequestArgs);
             };
             };
         },
         },
-
-         /**
-         * 
-         * @summary 查询用户组织机构信息 🔖 
-         */
-                async apiSysUserOrgInfoGet( options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListSysOrg>>> {
-                    const localVarAxiosArgs = await SysUserApiAxiosParamCreator(configuration).apiSysUserOrgInfoGet( options);
-                    return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
-                        const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
-                        return axios.request(axiosRequestArgs);
-                    };
-                },
-        
         /**
         /**
          * 
          * 
          * @summary 更新用户基本信息 🔖
          * @summary 更新用户基本信息 🔖
@@ -811,6 +799,19 @@ export const SysUserApiFp = function(configuration?: Configuration) {
         },
         },
         /**
         /**
          * 
          * 
+         * @summary 查询用户组织机构信息 🔖
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysUserOrgInfoGet(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListSysOrg>>> {
+            const localVarAxiosArgs = await SysUserApiAxiosParamCreator(configuration).apiSysUserOrgInfoGet(options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
+        /**
+         * 
          * @summary 获取用户扩展机构集合 🔖
          * @summary 获取用户扩展机构集合 🔖
          * @param {number} userId 
          * @param {number} userId 
          * @param {*} [options] Override http request option.
          * @param {*} [options] Override http request option.
@@ -977,6 +978,15 @@ export const SysUserApiFactory = function (configuration?: Configuration, basePa
         },
         },
         /**
         /**
          * 
          * 
+         * @summary 查询用户组织机构信息 🔖
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysUserOrgInfoGet(options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListSysOrg>> {
+            return SysUserApiFp(configuration).apiSysUserOrgInfoGet(options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
          * @summary 获取用户扩展机构集合 🔖
          * @summary 获取用户扩展机构集合 🔖
          * @param {number} userId 
          * @param {number} userId 
          * @param {*} [options] Override http request option.
          * @param {*} [options] Override http request option.
@@ -1122,6 +1132,16 @@ export class SysUserApi extends BaseAPI {
     }
     }
     /**
     /**
      * 
      * 
+     * @summary 查询用户组织机构信息 🔖
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof SysUserApi
+     */
+    public async apiSysUserOrgInfoGet(options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListSysOrg>> {
+        return SysUserApiFp(this.configuration).apiSysUserOrgInfoGet(options).then((request) => request(this.axios, this.basePath));
+    }
+    /**
+     * 
      * @summary 获取用户扩展机构集合 🔖
      * @summary 获取用户扩展机构集合 🔖
      * @param {number} userId 
      * @param {number} userId 
      * @param {*} [options] Override http request option.
      * @param {*} [options] Override http request option.
@@ -1197,13 +1217,4 @@ export class SysUserApi extends BaseAPI {
     public async apiSysUserUpdatePost(body?: UpdateUserInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
     public async apiSysUserUpdatePost(body?: UpdateUserInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
         return SysUserApiFp(this.configuration).apiSysUserUpdatePost(body, options).then((request) => request(this.axios, this.basePath));
         return SysUserApiFp(this.configuration).apiSysUserUpdatePost(body, options).then((request) => request(this.axios, this.basePath));
     }
     }
- 
-    /**
-         * 
-         * @summary 查询用户组织机构信息  
-         */
-        public async apiSysUserOrgInfoGet( options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListSysOrg>> { 
-            return SysUserApiFp(this.configuration).apiSysUserOrgInfoGet(options).  then((request) => request(this.axios, this.basePath)); 
-        }
-
 }
 }

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

@@ -101,6 +101,14 @@ export interface CodeGenConfig {
     dataType?: string | null;
     dataType?: string | null;
 
 
     /**
     /**
+     * 字段数据默认值
+     *
+     * @type {string}
+     * @memberof CodeGenConfig
+     */
+    defaultValue?: string | null;
+
+    /**
      * 可空.NET类型
      * 可空.NET类型
      *
      *
      * @type {string}
      * @type {string}

+ 8 - 0
Web/src/api-services/models/column-ouput.ts

@@ -53,6 +53,14 @@ export interface ColumnOuput {
     dataType?: string | null;
     dataType?: string | null;
 
 
     /**
     /**
+     * 字段数据默认值
+     *
+     * @type {string}
+     * @memberof ColumnOuput
+     */
+    defaultValue?: string | null;
+
+    /**
      * 是否为主键
      * 是否为主键
      *
      *
      * @type {boolean}
      * @type {boolean}

+ 71 - 69
Web/src/api-services/models/db-column-input.ts

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

+ 1 - 0
Web/src/api-services/models/index.ts

@@ -252,6 +252,7 @@ export * from './method-impl-attributes';
 export * from './method-info';
 export * from './method-info';
 export * from './module';
 export * from './module';
 export * from './module-handle';
 export * from './module-handle';
+export * from './move-db-column-input';
 export * from './notice-input';
 export * from './notice-input';
 export * from './notice-status-enum';
 export * from './notice-status-enum';
 export * from './notice-type-enum';
 export * from './notice-type-enum';

+ 54 - 0
Web/src/api-services/models/move-db-column-input.ts

@@ -0,0 +1,54 @@
+/* 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 MoveDbColumnInput
+ */
+export interface MoveDbColumnInput {
+
+    /**
+     * 数据库配置ID
+     *
+     * @type {string}
+     * @memberof MoveDbColumnInput
+     */
+    configId?: string | null;
+
+    /**
+     * 目标表名
+     *
+     * @type {string}
+     * @memberof MoveDbColumnInput
+     */
+    tableName?: string | null;
+
+    /**
+     * 要移动的列名
+     *
+     * @type {string}
+     * @memberof MoveDbColumnInput
+     */
+    columnName?: string | null;
+
+    /**
+     * 移动到该列后方(为空时移动到首列)
+     *
+     * @type {string}
+     * @memberof MoveDbColumnInput
+     */
+    afterColumnName?: string | null;
+}

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

@@ -141,6 +141,14 @@ export interface SysCodeGenConfig {
     netType?: string | null;
     netType?: string | null;
 
 
     /**
     /**
+     * 字段数据默认值
+     *
+     * @type {string}
+     * @memberof SysCodeGenConfig
+     */
+    defaultValue?: string | null;
+
+    /**
      * 作用类型(字典)
      * 作用类型(字典)
      *
      *
      * @type {string}
      * @type {string}

+ 41 - 39
Web/src/api-services/models/update-db-column-input.ts

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