From fc638a9a49010b1802a32da45400ceb7c8640347 Mon Sep 17 00:00:00 2001 From: zuohuaijun Date: Fri, 5 Jul 2024 01:41:52 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8E1=E3=80=81=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E9=85=8D=E7=BD=AE=20=202?= =?UTF-8?q?=E3=80=81=E5=8E=BB=E6=8E=89=E5=BC=80=E6=94=BE=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=BF=BD=E7=95=A5=E7=9A=84=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=20=203=E3=80=81=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=BC=96=E7=A0=81=E5=94=AF=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Admin.NET/Admin.NET.Application/Configuration/CodeGen.json | 2 +- Admin.NET/Admin.NET.Core/Entity/SysConfig.cs | 2 +- Admin.NET/Admin.NET.Core/Entity/SysOpenAccess.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Admin.NET/Admin.NET.Application/Configuration/CodeGen.json b/Admin.NET/Admin.NET.Application/Configuration/CodeGen.json index a0cd44f0..275087a8 100644 --- a/Admin.NET/Admin.NET.Application/Configuration/CodeGen.json +++ b/Admin.NET/Admin.NET.Application/Configuration/CodeGen.json @@ -3,7 +3,7 @@ // 代码生成配置项-程序集名称集合 "CodeGen": { - "EntityAssemblyNames": [ "Admin." ], + "EntityAssemblyNames": [ "Admin.NET.Core", "Admin.NET.Application" ], "BaseEntityNames": [ "EntityTenantId", "EntityTenant", "EntityTenantBaseData", "EntityBaseData", "EntityBase", "EntityBaseId" ], "EntityBaseColumn": { "EntityTenantId": [ "Id", "TenantId" ], diff --git a/Admin.NET/Admin.NET.Core/Entity/SysConfig.cs b/Admin.NET/Admin.NET.Core/Entity/SysConfig.cs index d4fb5f17..f1f5fe16 100644 --- a/Admin.NET/Admin.NET.Core/Entity/SysConfig.cs +++ b/Admin.NET/Admin.NET.Core/Entity/SysConfig.cs @@ -12,7 +12,7 @@ namespace Admin.NET.Core; [SugarTable(null, "系统参数配置表")] [SysTable] [SugarIndex("index_{table}_N", nameof(Name), OrderByType.Asc)] -[SugarIndex("index_{table}_C", nameof(Code), OrderByType.Asc)] +[SugarIndex("index_{table}_C", nameof(Code), OrderByType.Asc, IsUnique = true)] public partial class SysConfig : EntityBase { /// diff --git a/Admin.NET/Admin.NET.Core/Entity/SysOpenAccess.cs b/Admin.NET/Admin.NET.Core/Entity/SysOpenAccess.cs index 68185cfb..f96c0ac0 100644 --- a/Admin.NET/Admin.NET.Core/Entity/SysOpenAccess.cs +++ b/Admin.NET/Admin.NET.Core/Entity/SysOpenAccess.cs @@ -51,8 +51,8 @@ public partial class SysOpenAccess : EntityBase /// /// 绑定用户 /// - [Newtonsoft.Json.JsonIgnore] - [System.Text.Json.Serialization.JsonIgnore] + //[Newtonsoft.Json.JsonIgnore] + //[System.Text.Json.Serialization.JsonIgnore] [Navigate(NavigateType.OneToOne, nameof(BindUserId))] public SysUser BindUser { get; set; } } \ No newline at end of file