From 8d6f3a5c72d45b2910a0e3caa534f7f305c54231 Mon Sep 17 00:00:00 2001
From: wangli <wangli@hitrobotgroup.com>
Date: Tue, 23 Jul 2024 15:05:46 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E9=80=82=E9=85=8D=E6=9C=80=E6=96=B0=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm b/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm
index 1877b132..3b064577 100644
--- a/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm
+++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm
@@ -86,7 +86,7 @@
 			<el-row>
 				<el-col>
 					<el-button-group>
-						<el-button type="primary" icon="ele-Search" @@click="handleQuery" v-auth="'@(@Model.LowerClassName):page'" :loading="options.loading"> 查询 </el-button>
+						<el-button type="primary" icon="ele-Search" @@click="handleQuery" v-auth="'@(@Model.LowerClassName)/page'" :loading="options.loading"> 查询 </el-button>
 						<el-button icon="ele-Refresh" @@click="resetQuery" :loading="options.loading"> 重置 </el-button>
 						<el-button icon="ele-ZoomIn" @@click="changeAdvanceQueryUI" v-if="!state.showAdvanceQueryUI" style="margin-left: 5px"> 高级查询 </el-button>
 						<el-button icon="ele-ZoomOut" @@click="changeAdvanceQueryUI" v-if="state.showAdvanceQueryUI" style="margin-left: 5px"> 隐藏 </el-button>
@@ -98,7 +98,7 @@
         <el-card class="full-table" shadow="hover" style="margin-top: 5px">
 			<vxe-grid ref="xGrid" class="xGrid-style" v-bind="options" v-on="gridEvents">
 				<template #toolbar_buttons>
-					<el-button type="primary" icon="ele-Plus" @@click="handleAdd" v-auth="'@(@Model.LowerClassName):add'"> 新增 </el-button>
+					<el-button type="primary" icon="ele-Plus" @@click="handleAdd" v-auth="'@(@Model.LowerClassName)/add'"> 新增 </el-button>
 				</template>
 				<template #toolbar_tools> </template>
 				<template #empty>
@@ -163,14 +163,14 @@
 				<template #row_buttons="{ row }">
                     @if(@Model.PrintType == "custom") {
 					<el-tooltip content="打印" placement="top">
-						<el-button icon="ele-Printer" size="small" text type="primary" @@click="handlePrint(row)" v-auth="'@(@Model.LowerClassName):print'" />
+						<el-button icon="ele-Printer" size="small" text type="primary" @@click="handlePrint(row)" v-auth="'@(@Model.LowerClassName)/print'" />
 					</el-tooltip>
                     }
 					<el-tooltip content="编辑" placement="top">
-						<el-button icon="ele-Edit" size="small" text type="primary" @@click="handleEdit(row)" v-auth="'@(@Model.LowerClassName):update'" />
+						<el-button icon="ele-Edit" size="small" text type="primary" @@click="handleEdit(row)" v-auth="'@(@Model.LowerClassName)/update'" />
 					</el-tooltip>
 					<el-tooltip content="删除" placement="top">
-						<el-button icon="ele-Delete" size="small" text type="danger" @@click="handleDelete(row)" v-auth="'@(@Model.LowerClassName):delete'" />
+						<el-button icon="ele-Delete" size="small" text type="danger" @@click="handleDelete(row)" v-auth="'@(@Model.LowerClassName)/delete'" />
 					</el-tooltip>
 				</template>
 			</vxe-grid>

From 6726b2e739be7cf9672c7727e8b61ea173bc19c5 Mon Sep 17 00:00:00 2001
From: zuohuaijun <zuohuaijun@163.com>
Date: Wed, 24 Jul 2024 01:14:26 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=F0=9F=98=8E=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=A8=A1=E6=9D=BF=E6=A0=BC=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/Template/index.vue.vm             | 122 +++++++++---------
 1 file changed, 61 insertions(+), 61 deletions(-)

diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm b/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm
index 3b064577..43066dd5 100644
--- a/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm
+++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm
@@ -3,23 +3,23 @@
 	{
 		return text.ToString()[..1].ToLower() + text[1..]; // 首字母小写
 	}
-    var pkField = Model.TableField.Where(c => c.ColumnKey == "True").FirstOrDefault();
-    string pkFieldName = null;
-    if(pkField != null && !string.IsNullOrEmpty(pkField.PropertyName))
-    {
-        pkFieldName = LowerFirstLetter(pkField.PropertyName);
-    }
-    Dictionary<string, int> definedObjects = new Dictionary<string, int>();
-    bool haveLikeCdt = false;
-    foreach (var column in Model.TableField){
-        if (column.QueryWhether == "Y" && column.QueryType == "like"){
-            haveLikeCdt = true;
-        }
-    }
+	var pkField = Model.TableField.Where(c => c.ColumnKey == "True").FirstOrDefault();
+	string pkFieldName = null;
+	if(pkField != null && !string.IsNullOrEmpty(pkField.PropertyName))
+	{
+		pkFieldName = LowerFirstLetter(pkField.PropertyName);
+	}
+	Dictionary<string, int> definedObjects = new Dictionary<string, int>();
+	bool haveLikeCdt = false;
+	foreach (var column in Model.TableField){
+		if (column.QueryWhether == "Y" && column.QueryType == "like"){
+			haveLikeCdt = true;
+		}
+	}
 }
 <template>
-    <div class="@(@Model.LowerClassName)-container">
-        <el-card shadow="hover" :body-style="{ padding: '20px 20px 16px 10px', display: 'flex', width: '100%', height: '100%', alignItems: 'start' }">
+	<div class="@(@Model.LowerClassName)-container">
+		<el-card shadow="hover" :body-style="{ padding: '20px 20px 16px 10px', display: 'flex', width: '100%', height: '100%', alignItems: 'start' }">
 			<el-form :model="state.queryParams" ref="queryForm" :show-message="false" :inlineMessage="true" label-width="auto" style="flex: 1 1 0%" @@submit.prevent="handleQuery" >
 				<el-row :gutter="10">
 				@if(Model.QueryWhetherList.Count > 0){
@@ -38,8 +38,8 @@
 						} else if(@column.EffectType == "InputNumber") {
 					<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6" class="mb5" v-if="state.showAdvanceQueryUI">
 						<el-form-item label="@column.ColumnComment">
-              				<el-input-number v-model="state.queryParams.@(@column.LowerPropertyName)" placeholder="请输入@(@column.ColumnComment)" clearable @@keyup.enter.native="handleQuery" />
-            			</el-form-item>
+							<el-input-number v-model="state.queryParams.@(@column.LowerPropertyName)" placeholder="请输入@(@column.ColumnComment)" clearable @@keyup.enter.native="handleQuery" />
+					</el-form-item>
 					</el-col>
 						} else if(@column.EffectType == "fk") {
 					<el-col :xs="24" :sm="12" :md="8" :lg="6" :xl="6" class="mb5" v-if="state.showAdvanceQueryUI">
@@ -95,7 +95,7 @@
 			</el-row>
 		</el-card>
 
-        <el-card class="full-table" shadow="hover" style="margin-top: 5px">
+		<el-card class="full-table" shadow="hover" style="margin-top: 5px">
 			<vxe-grid ref="xGrid" class="xGrid-style" v-bind="options" v-on="gridEvents">
 				<template #toolbar_buttons>
 					<el-button type="primary" icon="ele-Plus" @@click="handleAdd" v-auth="'@(@Model.LowerClassName)/add'"> 新增 </el-button>
@@ -104,8 +104,8 @@
 				<template #empty>
 					<el-empty :image-size="200" />
 				</template>
-                @foreach (var column in Model.TableField) {
-                    if(@column.WhetherTable == "Y") {
+				@foreach (var column in Model.TableField) {
+					if(@column.WhetherTable == "Y") {
 						if(@column.EffectType == "Upload") {
 				@:<template #row_@(@column.LowerPropertyName)="{ row }">
 					@:<el-popover
@@ -144,28 +144,28 @@
 				@:</template>
 						} else if(@column.EffectType == "ConstSelector") {
 				@:<template #row_@(@column.LowerPropertyName)="{ row }">
-                    @:<span>{{codeToName(row.@(@column.LowerPropertyName), '@(@column.DictTypeCode)')}}</span>
+					@:<span>{{codeToName(row.@(@column.LowerPropertyName), '@(@column.DictTypeCode)')}}</span>
 				@:</template>
-                        } else if(@column.EffectType == "Select") {
+						} else if(@column.EffectType == "Select") {
 				@:<template #row_@(@column.LowerPropertyName)="{ row }">
-                    @:<el-tag :type="di('@(@column.DictTypeCode)', row.@(@column.LowerPropertyName))?.tagType"> {{di('@(@column.DictTypeCode)', row.@column.LowerPropertyName)?.name}}</el-tag>
+					@:<el-tag :type="di('@(@column.DictTypeCode)', row.@(@column.LowerPropertyName))?.tagType"> {{di('@(@column.DictTypeCode)', row.@column.LowerPropertyName)?.name}}</el-tag>
 				@:</template>
-                        } else if(@column.EffectType == "EnumSelector") {
+						} else if(@column.EffectType == "EnumSelector") {
 				@:<template #row_@(@column.LowerPropertyName)="{ row }">
-                    @:<el-tag :type="dv('@(@column.DictTypeCode)', row.@(@column.LowerPropertyName))?.tagType"> {{dv('@(@column.DictTypeCode)', row.@column.LowerPropertyName)?.name}}</el-tag>
+					@:<el-tag :type="dv('@(@column.DictTypeCode)', row.@(@column.LowerPropertyName))?.tagType"> {{dv('@(@column.DictTypeCode)', row.@column.LowerPropertyName)?.name}}</el-tag>
 				@:</template>
-                        }
-                    }
-                }
+						}
+					}
+				}
 				<template #row_record="{ row }">
 					<ModifyRecord :data="row" />
 				</template>
 				<template #row_buttons="{ row }">
-                    @if(@Model.PrintType == "custom") {
+					@if(@Model.PrintType == "custom") {
 					<el-tooltip content="打印" placement="top">
 						<el-button icon="ele-Printer" size="small" text type="primary" @@click="handlePrint(row)" v-auth="'@(@Model.LowerClassName)/print'" />
 					</el-tooltip>
-                    }
+					}
 					<el-tooltip content="编辑" placement="top">
 						<el-button icon="ele-Edit" size="small" text type="primary" @@click="handleEdit(row)" v-auth="'@(@Model.LowerClassName)/update'" />
 					</el-tooltip>
@@ -176,9 +176,9 @@
 			</vxe-grid>
 		</el-card>
 
-        <PrintDialog ref="printDialogRef" :title="state.title" @@reloadTable="handleQuery" />
-        <EditDialog ref="editDialogRef" :title="state.title" @@reloadTable="handleQuery" />
-    </div>
+		<PrintDialog ref="printDialogRef" :title="state.title" @@reloadTable="handleQuery" />
+		<EditDialog ref="editDialogRef" :title="state.title" @@reloadTable="handleQuery" />
+	</div>
 </template>
 
 <script lang="ts" setup name="@(@Model.LowerClassName)">
@@ -192,7 +192,7 @@ import { Local } from '/@@/utils/storage';
 
 @if(@Model.TableField.Any(x=>x.EffectType == "ConstSelector")){
 @:import { codeToName, getConstType } from "/@@/utils/constHelper";
-} 
+}
 @if(@Model.TableField.Any(x=>x.EffectType == "Select") || @Model.TableField.Any(x=>x.EffectType == "EnumSelector")){
 @:import { getDictLabelByVal as di, getDictDataList as dl } from '/@@/utils/dict-utils';
 }
@@ -224,12 +224,12 @@ import ModifyRecord from '/@@/components/table/modifyRecord.vue';
 // 模型
 @:import { @(@Model.ClassName), @(@Model.ClassName)Input, @(@Model.ClassName)Output } from '/@@/api-services/models';
 
-} else {  
+} else {
 @:import { page@(@Model.ClassName), delete@(@Model.ClassName) } from '/@@/api/@(@Model.PagePath)/@(@Model.LowerClassName)';
 foreach (var column in Model.QueryWhetherList){
-  if(@column.EffectType == "fk"){
-  @:import { get@(@column.FkEntityName)@(@column.PropertyName)Dropdown } from '/@@/api/@(@Model.PagePath)/@(@Model.LowerClassName)';
-  }
+	if(@column.EffectType == "fk"){
+	@:import { get@(@column.FkEntityName)@(@column.PropertyName)Dropdown } from '/@@/api/@(@Model.PagePath)/@(@Model.LowerClassName)';
+	}
 }
 }
 
@@ -364,24 +364,24 @@ const handleEdit = (row: any) => {
 
 // 打开打印页面
 const handlePrint = async (row: any) => {
-    state.title = '打印@(@Model.BusName)';
-    @if(@Model.PrintType == "custom"){
+	state.title = '打印@(@Model.BusName)';
+	@if(@Model.PrintType == "custom"){
 	if (@Model.IsApiService) {
-    @:var res = await getAPI(SysPrintApi).apiSysPrintPrintNameGet('@Model.PrintName');
+	@:var res = await getAPI(SysPrintApi).apiSysPrintPrintNameGet('@Model.PrintName');
 	} else {
 	@:var res = await getPrint@(@Model.ClassName)(row);
 	}
-    @:var printTemplate = res.data.result as SysPrint;
-    @:var template = JSON.parse(printTemplate.template);
-    @:var width = template.panels[0].width;
-    @:row['barCode'] = row.code;
-    @:row['qrCode'] = row.code;
-    @:row["printDate"] = formatDate(new Date(), 'YYYY-mm-dd HH:MM');
-    @:printDialogRef.value.showDialog(new hiprint.PrintTemplate({template: template}), row, width);
-    }
-    @if(@Model.PrintType == "auto"){
-    @:printDialogRef.value.showDialog(row);
-    }
+	@:var printTemplate = res.data.result as SysPrint;
+	@:var template = JSON.parse(printTemplate.template);
+	@:var width = template.panels[0].width;
+	@:row['barCode'] = row.code;
+	@:row['qrCode'] = row.code;
+	@:row["printDate"] = formatDate(new Date(), 'YYYY-mm-dd HH:MM');
+	@:printDialogRef.value.showDialog(new hiprint.PrintTemplate({template: template}), row, width);
+	}
+	@if(@Model.PrintType == "auto"){
+	@:printDialogRef.value.showDialog(row);
+	}
 };
 
 // 删除
@@ -392,14 +392,14 @@ const handleDelete = (row: any) => {
 		type: 'warning',
 	}).then(async () => {
 		@if (@Model.IsApiService) {
-        @:await getAPI(@(@Model.ClassName)Api).api@(@Model.ClassName)DeletePost({ id: row.id });
+		@:await getAPI(@(@Model.ClassName)Api).api@(@Model.ClassName)DeletePost({ id: row.id });
 		} else {
 		@:await delete@(@Model.ClassName)(row);
 		}
-        await handleQuery();
-        ElMessage.success('删除成功');
-    })
-    .catch(() => {});
+		await handleQuery();
+		ElMessage.success('删除成功');
+	})
+	.catch(() => {});
 };
 
 // 表格事件
@@ -417,12 +417,12 @@ const gridEvents: VxeGridListeners<@(@Model.ClassName)> = {
 };
 
 @foreach (var column in Model.QueryWhetherList) {
-  	@if(@column.EffectType == "fk") {
+	@if(@column.EffectType == "fk") {
 @:const @LowerFirstLetter(@column.FkEntityName)@(@column.PropertyName)DropdownList = ref<any>([]); 
 @:const get@(@column.FkEntityName)@(@column.PropertyName)DropdownList = async () => {
-    //@:let list = await get@(@column.FkEntityName)@(@column.PropertyName)Dropdown();
+	//@:let list = await get@(@column.FkEntityName)@(@column.PropertyName)Dropdown();
 	@:let list = await getAPI(@(@Model.ClassName)Api).api@(@Model.ClassName)@(@column.FkEntityName)@(@column.PropertyName)DropdownGet();
-    @:@LowerFirstLetter(@column.FkEntityName)@(@column.PropertyName)DropdownList.value = list.data.result ?? [];
+	@:@LowerFirstLetter(@column.FkEntityName)@(@column.PropertyName)DropdownList.value = list.data.result ?? [];
 @:};
 @:get@(@column.FkEntityName)@(@column.PropertyName)DropdownList();
 	}
@@ -433,6 +433,6 @@ const gridEvents: VxeGridListeners<@(@Model.ClassName)> = {
 :deep(.el-input),
 :deep(.el-select),
 :deep(.el-input-number) {
-    width: 100%;
+	width: 100%;
 }
 </style>

From fcd3de2585988b44abc7b3b1a0cae2355ff3b7bf Mon Sep 17 00:00:00 2001
From: zuohuaijun <zuohuaijun@163.com>
Date: Wed, 24 Jul 2024 01:44:43 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=F0=9F=98=8E1=E3=80=81=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E5=A4=96=E9=93=BE=E5=AD=97=E6=AE=B5=20=202=E3=80=81=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=90=8C=E6=AD=A5=E8=A1=8C=E6=94=BF=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?=E6=97=B6=E4=B8=80=E7=BA=A7=E5=8C=BA=E5=9F=9F=E7=BC=BA=E5=B0=91?=
 =?UTF-8?q?code=E7=BC=96=E7=A0=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin.NET.Core/Admin.NET.Core.csproj      |  4 +-
 .../Admin.NET.Core/Entity/SysCodeGenConfig.cs |  7 ++
 .../Service/CodeGen/Dto/CodeGenConfig.cs      |  5 +
 .../Service/CodeGen/Dto/PageCodeGenInput.cs   |  2 +-
 .../Service/CodeGen/SysCodeGenService.cs      |  7 +-
 .../Service/Region/SysRegionService.cs        |  9 +-
 .../wwwroot/Template/Service.cs.vm            |  4 +-
 .../apis/sys-code-gen-config-api.ts           | 44 ++++++---
 .../api-services/models/code-gen-config.ts    |  8 ++
 .../models/sys-code-gen-config.ts             |  8 ++
 .../models/update-code-gen-input.ts           | 96 +++++++++----------
 .../system/codeGen/component/fkDialog.vue     |  8 ++
 12 files changed, 133 insertions(+), 69 deletions(-)

diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
index 0930f88d..93bd7c32 100644
--- a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
+++ b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
@@ -32,13 +32,13 @@
     <PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="3.6.0" />
     <PackageReference Include="QRCoder" Version="1.6.0" />
     <PackageReference Include="RabbitMQ.Client" Version="6.8.1" />
-    <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.2" />
+    <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.3" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.4.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.6.0" />
     <PackageReference Include="SqlSugarCore" Version="5.1.4.166" />
     <PackageReference Include="SSH.NET" Version="2024.1.0" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.3" />
-    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1052" />
+    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1053" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
   </ItemGroup>
diff --git a/Admin.NET/Admin.NET.Core/Entity/SysCodeGenConfig.cs b/Admin.NET/Admin.NET.Core/Entity/SysCodeGenConfig.cs
index 03f6b814..873fd0ad 100644
--- a/Admin.NET/Admin.NET.Core/Entity/SysCodeGenConfig.cs
+++ b/Admin.NET/Admin.NET.Core/Entity/SysCodeGenConfig.cs
@@ -81,6 +81,13 @@ public partial class SysCodeGenConfig : EntityBase
     [MaxLength(64)]
     public string? FkColumnName { get; set; }
 
+    /// <summary>
+    /// 外键链接字段
+    /// </summary>
+    [SugarColumn(ColumnDescription = "外键链接字段", Length = 64)]
+    [MaxLength(64)]
+    public string? FkLinkColumnName { get; set; }
+
     /// <summary>
     /// 外键显示字段.NET类型
     /// </summary>
diff --git a/Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CodeGenConfig.cs b/Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CodeGenConfig.cs
index 0b842d8b..90b52b29 100644
--- a/Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CodeGenConfig.cs
+++ b/Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CodeGenConfig.cs
@@ -77,6 +77,11 @@ public class CodeGenConfig
     /// </summary>
     public string FkColumnName { get; set; }
 
+    /// <summary>
+    /// 外键链接字段
+    /// </summary>
+    public string FkLinkColumnName { get; set; }
+
     /// <summary>
     /// 外键显示字段(首字母小写)
     /// </summary>
diff --git a/Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/PageCodeGenInput.cs b/Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/PageCodeGenInput.cs
index 2e51e331..ab0574d8 100644
--- a/Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/PageCodeGenInput.cs
+++ b/Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/PageCodeGenInput.cs
@@ -178,7 +178,7 @@ public class DeleteCodeGenInput
     public long Id { get; set; }
 }
 
-public class UpdateCodeGenInput : PageCodeGenInput
+public class UpdateCodeGenInput : AddCodeGenInput
 {
     /// <summary>
     /// 代码生成器Id
diff --git a/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs b/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs
index a6ab9946..3dda5940 100644
--- a/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs
+++ b/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs
@@ -78,7 +78,12 @@ public class SysCodeGenService : IDynamicApiController, ITransient
         if (isExist)
             throw Oops.Oh(ErrorCodeEnum.D1400);
 
-        await _db.Updateable(input.Adapt<SysCodeGen>()).ExecuteCommandAsync();
+        var codeGen = input.Adapt<SysCodeGen>();
+        await _db.Updateable(codeGen).ExecuteCommandAsync();
+
+        // 加入配置表中
+        await _codeGenConfigService.DeleteCodeGenConfig(codeGen.Id);
+        _codeGenConfigService.AddList(GetColumnList(input), codeGen);
     }
 
     /// <summary>
diff --git a/Admin.NET/Admin.NET.Core/Service/Region/SysRegionService.cs b/Admin.NET/Admin.NET.Core/Service/Region/SysRegionService.cs
index f974a88e..5b1a8cb8 100644
--- a/Admin.NET/Admin.NET.Core/Service/Region/SysRegionService.cs
+++ b/Admin.NET/Admin.NET.Core/Service/Region/SysRegionService.cs
@@ -180,7 +180,7 @@ public class SysRegionService : IDynamicApiController, ITransient
             list.Add(region);
 
             // 市级
-            if (!string.IsNullOrEmpty(item.Href) && syncLevel > 1)
+            if (!string.IsNullOrEmpty(item.Href))
             {
                 var dom1 = await context.OpenAsync(item.Href);
                 var itemList1 = dom1.QuerySelectorAll("table.citytable tr.citytr td a");
@@ -196,6 +196,13 @@ public class SysRegionService : IDynamicApiController, ITransient
                         Remark = item1.Href,
                         Level = 2,
                     };
+                    // 若URL中查询的一级行政区域缺少Code则通过二级区域填充
+                    if (list.Count == 1 && !string.IsNullOrEmpty(region1.Code))
+                        region.Code = region1.Code.Substring(0, 2).PadRight(region1.Code.Length, '0');
+                    // 同步层级为“1-省级”退出
+                    if (syncLevel < 2)
+                        break;
+
                     list.Add(region1);
 
                     // 区县级
diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm b/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm
index 2516af7a..4b4e8356 100644
--- a/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm
+++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm
@@ -78,7 +78,7 @@ if (@column.QueryWhether == "Y"){
     @foreach (var column in Model.TableField){
         if(@column.EffectType == "fk"){
             joinTableName += ", " + column.PropertyName.ToLower();
-            @:.LeftJoin<@(@column.FkEntityName)>((@(@joinTableName)) => u.@(@column.PropertyName) == @(@column.PropertyName.ToLower()).Id )
+            @:.LeftJoin<@(@column.FkEntityName)>((@(@joinTableName)) => u.@(@column.PropertyName) == @(@column.PropertyName.ToLower()).@(@column.FkLinkColumnName) )
         } else if(@column.EffectType == "ApiTreeSelect"){
             joinTableName += ", " + column.PropertyName.ToLower();
             @:.LeftJoin<@(@column.FkEntityName)>((@(@joinTableName)) => u.@(@column.PropertyName) == @(@column.PropertyName.ToLower()).@(@column.ValueColumn) )
@@ -205,7 +205,7 @@ if(@column.EffectType == "fk" && (@column.WhetherAddUpdate == "Y" || column.Quer
                 @:.Select(u => new
                 @:{
                     @:Label = u.@(@column.FkColumnName),
-                    @:Value = u.Id
+                    @:Value = u.@(@column.FkLinkColumnName)
                 @:}
                 @:).ToListAsync();
     @:}
diff --git a/Web/src/api-services/apis/sys-code-gen-config-api.ts b/Web/src/api-services/apis/sys-code-gen-config-api.ts
index 4c7d0e16..33b72c93 100644
--- a/Web/src/api-services/apis/sys-code-gen-config-api.ts
+++ b/Web/src/api-services/apis/sys-code-gen-config-api.ts
@@ -42,6 +42,7 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
          * @param {string} [fkTableName] 外键表名称
          * @param {string} [lowerFkEntityName] 外键实体名称(首字母小写)
          * @param {string} [fkColumnName] 外键显示字段
+         * @param {string} [fkLinkColumnName] 外键链接字段
          * @param {string} [lowerFkColumnName] 外键显示字段(首字母小写)
          * @param {string} [fkColumnNetType] 外键显示字段.NET类型
          * @param {string} [dictTypeCode] 字典code
@@ -63,7 +64,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, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: 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, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        apiSysCodeGenConfigDetailGet: async (id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: 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, 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');
@@ -136,6 +137,10 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
                 localVarQueryParameter['FkColumnName'] = fkColumnName;
             }
 
+            if (fkLinkColumnName !== undefined) {
+                localVarQueryParameter['FkLinkColumnName'] = fkLinkColumnName;
+            }
+
             if (lowerFkColumnName !== undefined) {
                 localVarQueryParameter['LowerFkColumnName'] = lowerFkColumnName;
             }
@@ -240,6 +245,7 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
          * @param {string} [fkTableName] 外键表名称
          * @param {string} [lowerFkEntityName] 外键实体名称(首字母小写)
          * @param {string} [fkColumnName] 外键显示字段
+         * @param {string} [fkLinkColumnName] 外键链接字段
          * @param {string} [lowerFkColumnName] 外键显示字段(首字母小写)
          * @param {string} [fkColumnNetType] 外键显示字段.NET类型
          * @param {string} [dictTypeCode] 字典code
@@ -261,7 +267,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, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: 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, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        apiSysCodeGenConfigListGet: async (id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: 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, 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');
@@ -334,6 +340,10 @@ export const SysCodeGenConfigApiAxiosParamCreator = function (configuration?: Co
                 localVarQueryParameter['FkColumnName'] = fkColumnName;
             }
 
+            if (fkLinkColumnName !== undefined) {
+                localVarQueryParameter['FkLinkColumnName'] = fkLinkColumnName;
+            }
+
             if (lowerFkColumnName !== undefined) {
                 localVarQueryParameter['LowerFkColumnName'] = lowerFkColumnName;
             }
@@ -495,6 +505,7 @@ export const SysCodeGenConfigApiFp = function(configuration?: Configuration) {
          * @param {string} [fkTableName] 外键表名称
          * @param {string} [lowerFkEntityName] 外键实体名称(首字母小写)
          * @param {string} [fkColumnName] 外键显示字段
+         * @param {string} [fkLinkColumnName] 外键链接字段
          * @param {string} [lowerFkColumnName] 外键显示字段(首字母小写)
          * @param {string} [fkColumnNetType] 外键显示字段.NET类型
          * @param {string} [dictTypeCode] 字典code
@@ -516,8 +527,8 @@ 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, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: 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, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultSysCodeGenConfig>>> {
-            const localVarAxiosArgs = await SysCodeGenConfigApiAxiosParamCreator(configuration).apiSysCodeGenConfigDetailGet(id, codeGenId, columnName, propertyName, columnLength, lowerPropertyName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, whetherSortable, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, options);
+        async apiSysCodeGenConfigDetailGet(id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: 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, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultSysCodeGenConfig>>> {
+            const localVarAxiosArgs = await SysCodeGenConfigApiAxiosParamCreator(configuration).apiSysCodeGenConfigDetailGet(id, codeGenId, columnName, propertyName, columnLength, lowerPropertyName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, fkLinkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, whetherSortable, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -539,6 +550,7 @@ export const SysCodeGenConfigApiFp = function(configuration?: Configuration) {
          * @param {string} [fkTableName] 外键表名称
          * @param {string} [lowerFkEntityName] 外键实体名称(首字母小写)
          * @param {string} [fkColumnName] 外键显示字段
+         * @param {string} [fkLinkColumnName] 外键链接字段
          * @param {string} [lowerFkColumnName] 外键显示字段(首字母小写)
          * @param {string} [fkColumnNetType] 外键显示字段.NET类型
          * @param {string} [dictTypeCode] 字典code
@@ -560,8 +572,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, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: 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, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListCodeGenConfig>>> {
-            const localVarAxiosArgs = await SysCodeGenConfigApiAxiosParamCreator(configuration).apiSysCodeGenConfigListGet(id, codeGenId, columnName, propertyName, columnLength, lowerPropertyName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, whetherSortable, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, options);
+        async apiSysCodeGenConfigListGet(id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: 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, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListCodeGenConfig>>> {
+            const localVarAxiosArgs = await SysCodeGenConfigApiAxiosParamCreator(configuration).apiSysCodeGenConfigListGet(id, codeGenId, columnName, propertyName, columnLength, lowerPropertyName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, fkLinkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, whetherSortable, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -606,6 +618,7 @@ export const SysCodeGenConfigApiFactory = function (configuration?: Configuratio
          * @param {string} [fkTableName] 外键表名称
          * @param {string} [lowerFkEntityName] 外键实体名称(首字母小写)
          * @param {string} [fkColumnName] 外键显示字段
+         * @param {string} [fkLinkColumnName] 外键链接字段
          * @param {string} [lowerFkColumnName] 外键显示字段(首字母小写)
          * @param {string} [fkColumnNetType] 外键显示字段.NET类型
          * @param {string} [dictTypeCode] 字典code
@@ -627,8 +640,8 @@ 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, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: 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, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultSysCodeGenConfig>> {
-            return SysCodeGenConfigApiFp(configuration).apiSysCodeGenConfigDetailGet(id, codeGenId, columnName, propertyName, columnLength, lowerPropertyName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, whetherSortable, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, options).then((request) => request(axios, basePath));
+        async apiSysCodeGenConfigDetailGet(id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: 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, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultSysCodeGenConfig>> {
+            return SysCodeGenConfigApiFp(configuration).apiSysCodeGenConfigDetailGet(id, codeGenId, columnName, propertyName, columnLength, lowerPropertyName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, fkLinkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, whetherSortable, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -646,6 +659,7 @@ export const SysCodeGenConfigApiFactory = function (configuration?: Configuratio
          * @param {string} [fkTableName] 外键表名称
          * @param {string} [lowerFkEntityName] 外键实体名称(首字母小写)
          * @param {string} [fkColumnName] 外键显示字段
+         * @param {string} [fkLinkColumnName] 外键链接字段
          * @param {string} [lowerFkColumnName] 外键显示字段(首字母小写)
          * @param {string} [fkColumnNetType] 外键显示字段.NET类型
          * @param {string} [dictTypeCode] 字典code
@@ -667,8 +681,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, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: 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, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListCodeGenConfig>> {
-            return SysCodeGenConfigApiFp(configuration).apiSysCodeGenConfigListGet(id, codeGenId, columnName, propertyName, columnLength, lowerPropertyName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, whetherSortable, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, options).then((request) => request(axios, basePath));
+        async apiSysCodeGenConfigListGet(id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: 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, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListCodeGenConfig>> {
+            return SysCodeGenConfigApiFp(configuration).apiSysCodeGenConfigListGet(id, codeGenId, columnName, propertyName, columnLength, lowerPropertyName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, fkLinkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, whetherSortable, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -706,6 +720,7 @@ export class SysCodeGenConfigApi extends BaseAPI {
      * @param {string} [fkTableName] 外键表名称
      * @param {string} [lowerFkEntityName] 外键实体名称(首字母小写)
      * @param {string} [fkColumnName] 外键显示字段
+     * @param {string} [fkLinkColumnName] 外键链接字段
      * @param {string} [lowerFkColumnName] 外键显示字段(首字母小写)
      * @param {string} [fkColumnNetType] 外键显示字段.NET类型
      * @param {string} [dictTypeCode] 字典code
@@ -728,8 +743,8 @@ 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, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: 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, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultSysCodeGenConfig>> {
-        return SysCodeGenConfigApiFp(this.configuration).apiSysCodeGenConfigDetailGet(id, codeGenId, columnName, propertyName, columnLength, lowerPropertyName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, whetherSortable, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, options).then((request) => request(this.axios, this.basePath));
+    public async apiSysCodeGenConfigDetailGet(id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: 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, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultSysCodeGenConfig>> {
+        return SysCodeGenConfigApiFp(this.configuration).apiSysCodeGenConfigDetailGet(id, codeGenId, columnName, propertyName, columnLength, lowerPropertyName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, fkLinkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, whetherSortable, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
@@ -747,6 +762,7 @@ export class SysCodeGenConfigApi extends BaseAPI {
      * @param {string} [fkTableName] 外键表名称
      * @param {string} [lowerFkEntityName] 外键实体名称(首字母小写)
      * @param {string} [fkColumnName] 外键显示字段
+     * @param {string} [fkLinkColumnName] 外键链接字段
      * @param {string} [lowerFkColumnName] 外键显示字段(首字母小写)
      * @param {string} [fkColumnNetType] 外键显示字段.NET类型
      * @param {string} [dictTypeCode] 字典code
@@ -769,8 +785,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, fkEntityName?: string, fkTableName?: string, lowerFkEntityName?: string, fkColumnName?: 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, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListCodeGenConfig>> {
-        return SysCodeGenConfigApiFp(this.configuration).apiSysCodeGenConfigListGet(id, codeGenId, columnName, propertyName, columnLength, lowerPropertyName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, whetherSortable, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, options).then((request) => request(this.axios, this.basePath));
+    public async apiSysCodeGenConfigListGet(id?: number, codeGenId?: number, columnName?: string, propertyName?: string, columnLength?: number, lowerPropertyName?: string, columnComment?: string, netType?: string, effectType?: 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, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListCodeGenConfig>> {
+        return SysCodeGenConfigApiFp(this.configuration).apiSysCodeGenConfigListGet(id, codeGenId, columnName, propertyName, columnLength, lowerPropertyName, columnComment, netType, effectType, fkEntityName, fkTableName, lowerFkEntityName, fkColumnName, fkLinkColumnName, lowerFkColumnName, fkColumnNetType, dictTypeCode, whetherRetract, whetherRequired, whetherSortable, queryWhether, queryType, whetherTable, whetherAddUpdate, columnKey, dataType, whetherCommon, tableNickName, displayColumn, valueColumn, pidColumn, orderNo, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
diff --git a/Web/src/api-services/models/code-gen-config.ts b/Web/src/api-services/models/code-gen-config.ts
index eb3c78cf..bcf4c626 100644
--- a/Web/src/api-services/models/code-gen-config.ts
+++ b/Web/src/api-services/models/code-gen-config.ts
@@ -124,6 +124,14 @@ export interface CodeGenConfig {
      */
     fkColumnName?: string | null;
 
+    /**
+     * 外键链接字段
+     *
+     * @type {string}
+     * @memberof CodeGenConfig
+     */
+    fkLinkColumnName?: string | null;
+
     /**
      * 外键显示字段(首字母小写)
      *
diff --git a/Web/src/api-services/models/sys-code-gen-config.ts b/Web/src/api-services/models/sys-code-gen-config.ts
index 48c2e3dd..95ddc5c7 100644
--- a/Web/src/api-services/models/sys-code-gen-config.ts
+++ b/Web/src/api-services/models/sys-code-gen-config.ts
@@ -164,6 +164,14 @@ export interface SysCodeGenConfig {
      */
     fkColumnName?: string | null;
 
+    /**
+     * 外键链接字段
+     *
+     * @type {string}
+     * @memberof SysCodeGenConfig
+     */
+    fkLinkColumnName?: string | null;
+
     /**
      * 外键显示字段.NET类型
      *
diff --git a/Web/src/api-services/models/update-code-gen-input.ts b/Web/src/api-services/models/update-code-gen-input.ts
index 887afb4b..8ec577ea 100644
--- a/Web/src/api-services/models/update-code-gen-input.ts
+++ b/Web/src/api-services/models/update-code-gen-input.ts
@@ -82,14 +82,6 @@ export interface UpdateCodeGenInput {
      */
     descStr?: string | null;
 
-    /**
-     * 作者姓名
-     *
-     * @type {string}
-     * @memberof UpdateCodeGenInput
-     */
-    authorName?: string | null;
-
     /**
      * 类名
      *
@@ -138,38 +130,6 @@ export interface UpdateCodeGenInput {
      */
     connectionString?: string | null;
 
-    /**
-     * 生成方式
-     *
-     * @type {string}
-     * @memberof UpdateCodeGenInput
-     */
-    generateType?: string | null;
-
-    /**
-     * 数据库表名
-     *
-     * @type {string}
-     * @memberof UpdateCodeGenInput
-     */
-    tableName?: string | null;
-
-    /**
-     * 命名空间
-     *
-     * @type {string}
-     * @memberof UpdateCodeGenInput
-     */
-    nameSpace?: string | null;
-
-    /**
-     * 业务名（业务代码包名称）
-     *
-     * @type {string}
-     * @memberof UpdateCodeGenInput
-     */
-    busName?: string | null;
-
     /**
      * 功能名（数据库表名称）
      *
@@ -186,14 +146,6 @@ export interface UpdateCodeGenInput {
      */
     menuApplication?: string | null;
 
-    /**
-     * 是否生成菜单
-     *
-     * @type {boolean}
-     * @memberof UpdateCodeGenInput
-     */
-    generateMenu?: boolean;
-
     /**
      * 菜单父级
      *
@@ -226,6 +178,54 @@ export interface UpdateCodeGenInput {
      */
     printName?: string | null;
 
+    /**
+     * 数据库表名
+     *
+     * @type {string}
+     * @memberof UpdateCodeGenInput
+     */
+    tableName: string;
+
+    /**
+     * 业务名（业务代码包名称）
+     *
+     * @type {string}
+     * @memberof UpdateCodeGenInput
+     */
+    busName: string;
+
+    /**
+     * 命名空间
+     *
+     * @type {string}
+     * @memberof UpdateCodeGenInput
+     */
+    nameSpace: string;
+
+    /**
+     * 作者姓名
+     *
+     * @type {string}
+     * @memberof UpdateCodeGenInput
+     */
+    authorName: string;
+
+    /**
+     * 生成方式
+     *
+     * @type {string}
+     * @memberof UpdateCodeGenInput
+     */
+    generateType: string;
+
+    /**
+     * 是否生成菜单
+     *
+     * @type {boolean}
+     * @memberof UpdateCodeGenInput
+     */
+    generateMenu: boolean;
+
     /**
      * 是否使用 Api Service
      *
diff --git a/Web/src/views/system/codeGen/component/fkDialog.vue b/Web/src/views/system/codeGen/component/fkDialog.vue
index 33723330..4657b7d4 100644
--- a/Web/src/views/system/codeGen/component/fkDialog.vue
+++ b/Web/src/views/system/codeGen/component/fkDialog.vue
@@ -30,6 +30,13 @@
 							</el-select>
 						</el-form-item>
 					</el-col>
+					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
+						<el-form-item label="链接字段" prop="linkColumnName">
+							<el-select v-model="state.ruleForm.linkColumnName" class="w100">
+								<el-option v-for="item in state.columnData" :key="item.columnName" :label="item.columnName + ' [' + item.columnComment + ']'" :value="item.columnName" />
+							</el-select>
+						</el-form-item>
+					</el-col>
 				</el-row>
 			</el-form>
 			<template #footer>
@@ -108,6 +115,7 @@ const closeDialog = () => {
 	let tableData = state.tableData.filter((x) => x.tableName == state.ruleForm.tableName);
 	rowdata.fkEntityName = tableData.length == 0 ? '' : tableData[0].entityName;
 	rowdata.fkColumnName = state.ruleForm.columnName;
+	rowdata.fkLinkColumnName = state.ruleForm.linkColumnName;
 	let columnData = state.columnData.filter((x) => x.columnName == state.ruleForm.columnName);
 	rowdata.fkColumnNetType = columnData.length == 0 ? '' : columnData[0].netType;
 	emits('submitRefreshFk', rowdata);

From f83d08c8f0828212c53a4de5ed2eb1c0b0bb65e1 Mon Sep 17 00:00:00 2001
From: Master <master@orzsoft.com>
Date: Wed, 24 Jul 2024 09:04:18 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E7=B1=BB=E5=9E=8B=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs b/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs
index 3dda5940..5962e42b 100644
--- a/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs
+++ b/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs
@@ -83,7 +83,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
 
         // 加入配置表中
         await _codeGenConfigService.DeleteCodeGenConfig(codeGen.Id);
-        _codeGenConfigService.AddList(GetColumnList(input), codeGen);
+        _codeGenConfigService.AddList(GetColumnList(input.Adapt<AddCodeGenInput>()), codeGen);
     }
 
     /// <summary>

From d3aebb5145f01f44ff42055a4b3a22efb1967ba3 Mon Sep 17 00:00:00 2001
From: zuohuaijun <zuohuaijun@163.com>
Date: Wed, 24 Jul 2024 09:55:47 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=F0=9F=98=8E=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=8F=8A=E5=8D=87=E7=BA=A7npm=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin.NET.Core/Admin.NET.Core.csproj      |  2 +-
 .../Service/CodeGen/SysCodeGenService.cs      |  7 ++++---
 Web/package.json                              | 20 +++++++++----------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
index 93bd7c32..71db614c 100644
--- a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
+++ b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
@@ -38,7 +38,7 @@
     <PackageReference Include="SqlSugarCore" Version="5.1.4.166" />
     <PackageReference Include="SSH.NET" Version="2024.1.0" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.3" />
-    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1053" />
+    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1054" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
   </ItemGroup>
diff --git a/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs b/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs
index 5962e42b..bc30f16c 100644
--- a/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs
+++ b/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs
@@ -61,7 +61,8 @@ public class SysCodeGenService : IDynamicApiController, ITransient
 
         var codeGen = input.Adapt<SysCodeGen>();
         var newCodeGen = await _db.Insertable(codeGen).ExecuteReturnEntityAsync();
-        // 加入配置表中
+
+        // 增加配置表
         _codeGenConfigService.AddList(GetColumnList(input), newCodeGen);
     }
 
@@ -81,7 +82,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
         var codeGen = input.Adapt<SysCodeGen>();
         await _db.Updateable(codeGen).ExecuteCommandAsync();
 
-        // 加入配置表中
+        // 更新配置表
         await _codeGenConfigService.DeleteCodeGenConfig(codeGen.Id);
         _codeGenConfigService.AddList(GetColumnList(input.Adapt<AddCodeGenInput>()), codeGen);
     }
@@ -102,7 +103,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
         {
             _db.Deleteable<SysCodeGen>().In(u.Id).ExecuteCommand();
 
-            // 删除配置表中
+            // 删除配置表
             codeGenConfigTaskList.Add(_codeGenConfigService.DeleteCodeGenConfig(u.Id));
         });
         await Task.WhenAll(codeGenConfigTaskList);
diff --git a/Web/package.json b/Web/package.json
index 9dc92791..efad079d 100644
--- a/Web/package.json
+++ b/Web/package.json
@@ -2,7 +2,7 @@
 	"name": "admin.net.pro",
 	"type": "module",
 	"version": "2.4.33",
-	"lastBuildTime": "2024.07.20",
+	"lastBuildTime": "2024.07.24",
 	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
 	"author": "zuohuaijun",
 	"license": "MIT",
@@ -59,7 +59,7 @@
 		"vform3-builds": "^3.0.10",
 		"vue": "^3.4.33",
 		"vue-clipboard3": "^2.0.0",
-		"vue-demi": "^0.14.8",
+		"vue-demi": "^0.14.9",
 		"vue-grid-layout": "3.0.0-beta1",
 		"vue-i18n": "^9.13.1",
 		"vue-json-pretty": "^2.4.0",
@@ -68,8 +68,8 @@
 		"vue-signature-pad": "^3.0.2",
 		"vue3-tree-org": "^4.2.2",
 		"vuedraggable": "4.0.3",
-		"vxe-pc-ui": "^4.0.77",
-		"vxe-table": "^4.7.56",
+		"vxe-pc-ui": "^4.0.82",
+		"vxe-table": "^4.7.59",
 		"vxe-table-plugin-element": "^4.0.4",
 		"vxe-table-plugin-export-xlsx": "^4.0.5",
 		"xe-utils": "^3.5.28",
@@ -79,12 +79,12 @@
 		"@iconify/vue": "^4.1.2",
 		"@plugin-web-update-notification/vite": "^1.7.1",
 		"@types/lodash-es": "^4.17.12",
-		"@types/node": "^20.14.11",
+		"@types/node": "^20.14.12",
 		"@types/nprogress": "^0.2.3",
 		"@types/sortablejs": "^1.15.8",
-		"@typescript-eslint/eslint-plugin": "^7.16.1",
-		"@typescript-eslint/parser": "^7.16.1",
-		"@vitejs/plugin-vue": "^5.0.5",
+		"@typescript-eslint/eslint-plugin": "^7.17.0",
+		"@typescript-eslint/parser": "^7.17.0",
+		"@vitejs/plugin-vue": "^5.1.0",
 		"@vitejs/plugin-vue-jsx": "^4.0.0",
 		"@vue/compiler-sfc": "^3.4.33",
 		"code-inspector-plugin": "^0.14.2",
@@ -95,10 +95,10 @@
 		"rollup-plugin-visualizer": "^5.12.0",
 		"sass": "^1.77.8",
 		"terser": "^5.31.3",
-		"typescript": "^5.5.3",
+		"typescript": "^5.5.4",
 		"vite": "^5.3.4",
 		"vite-plugin-cdn-import": "^1.0.1",
-		"vite-plugin-compression2": "^1.1.2",
+		"vite-plugin-compression2": "^1.1.3",
 		"vite-plugin-vue-setup-extend": "^0.4.0",
 		"vue-eslint-parser": "^9.4.3"
 	},

From 27e78920faccac6a6d962dcead45e4118daa1079 Mon Sep 17 00:00:00 2001
From: zuohuaijun <zuohuaijun@163.com>
Date: Wed, 24 Jul 2024 10:50:40 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=F0=9F=98=8E=E8=8B=A5=E5=BA=93=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=98=AF=E4=BA=BA=E5=A4=A7=E9=87=91=E4=BB=93=E5=88=99?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=AE=BE=E7=BD=AEPG=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs b/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs
index 33f93a2d..5c3c3ee9 100644
--- a/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs
+++ b/Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs
@@ -92,6 +92,10 @@ public static class SqlSugarSetup
             IsAutoUpdateQueryFilter = true, // 启用更新查询过滤器
             SqlServerCodeFirstNvarchar = true // 采用Nvarchar
         };
+
+        // 若库类型是人大金仓则默认设置PG模式
+        if (config.DbType == SqlSugar.DbType.Kdbndp)
+            config.MoreSettings.DatabaseModel = SqlSugar.DbType.PostgreSQL; // 配置PG模式主要是兼容系统表差异
     }
 
     /// <summary>