diff --git a/Src/Dlhis.Entity/Basic/Entity/WerkEntity.cs b/Src/Dlhis.Entity/Basic/Entity/WerkEntity.cs deleted file mode 100644 index 8d3f9925..00000000 --- a/Src/Dlhis.Entity/Basic/Entity/WerkEntity.cs +++ /dev/null @@ -1,26 +0,0 @@ -using Kurisu.SqlSugar; -using SqlSugar; - -namespace Dlhis.Entity.Basic.Entity; - -[SugarTable(TableName = "Werk", TableDescription = "人事范围")] -public class WerkEntity : SugarBaseEntity -{ - /// - /// 代号 - /// - [SugarColumn(ColumnDescription = "代号")] - public string Code { get; set; } - - /// - /// 名称 - /// - [SugarColumn(ColumnDescription = "名称")] - public string Name { get; set; } - - /// - /// 是否可见 - /// - [SugarColumn(ColumnDescription = "是否可见", ColumnDataType = "bit")] - public bool Visible { get; set; } -} diff --git a/Src/Dlhis.Entity/Sys/Entities/IdentityResourceClaimEntity.cs b/Src/Dlhis.Entity/Sys/Entities/IdentityResourceClaimEntity.cs new file mode 100644 index 00000000..da22faf9 --- /dev/null +++ b/Src/Dlhis.Entity/Sys/Entities/IdentityResourceClaimEntity.cs @@ -0,0 +1,17 @@ +using Microsoft.Extensions.DependencyInjection; +using SqlSugar; + +namespace Dlhis.Entity.Sys.Entities; + + + +[SkipScan] +[SugarTable(TableName = "IdentityResourceClaims")] +public class IdentityResourceClaimEntity +{ + public int Id { get; set; } + + public string IdentityResourceId { get; set; } + + public string Type { get; set; } +} diff --git a/Src/Dlhis.Entity/Sys/Entities/IdentityResourceClaims.cs b/Src/Dlhis.Entity/Sys/Entities/IdentityResourceClaims.cs deleted file mode 100644 index 1aef75ef..00000000 --- a/Src/Dlhis.Entity/Sys/Entities/IdentityResourceClaims.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Dlhis.Entity.Sys.Entities; - -public class IdentityResourceClaims -{ - public int Id { get; set; } - - public string IdentityResourceId { get; set; } - - public string Type { get; set; } -} diff --git a/Src/Dlhis.Entity/Sys/Entities/IdentityResources.cs b/Src/Dlhis.Entity/Sys/Entities/IdentityResourceEntity.cs similarity index 70% rename from Src/Dlhis.Entity/Sys/Entities/IdentityResources.cs rename to Src/Dlhis.Entity/Sys/Entities/IdentityResourceEntity.cs index ede62b02..89997652 100644 --- a/Src/Dlhis.Entity/Sys/Entities/IdentityResources.cs +++ b/Src/Dlhis.Entity/Sys/Entities/IdentityResourceEntity.cs @@ -1,6 +1,12 @@ -namespace Dlhis.Entity.Sys.Entities; +using Microsoft.Extensions.DependencyInjection; +using SqlSugar; -public class IdentityResources +namespace Dlhis.Entity.Sys.Entities; + + +[SkipScan] +[SugarTable(TableName = "IdentityResources")] +public class IdentityResourceEntity { public int Id { get; set; } public bool Enabled { get; set; } diff --git a/Src/Dlhis.Entity/Sys/Entities/RoleEntity.cs b/Src/Dlhis.Entity/Sys/Entities/RoleEntity.cs index 62b0428c..610770db 100644 --- a/Src/Dlhis.Entity/Sys/Entities/RoleEntity.cs +++ b/Src/Dlhis.Entity/Sys/Entities/RoleEntity.cs @@ -1,10 +1,12 @@ -using SqlSugar; +using Microsoft.Extensions.DependencyInjection; +using SqlSugar; namespace Dlhis.Entity.Sys.Entities; /// /// identity-roles /// +[SkipScan] [SugarTable(TableName = "Roles")] public class RoleEntity { diff --git a/Src/Dlhis.Entity/Sys/Entities/TenantEntity.cs b/Src/Dlhis.Entity/Sys/Entities/TenantEntity.cs index 7e7e13b3..5897f319 100644 --- a/Src/Dlhis.Entity/Sys/Entities/TenantEntity.cs +++ b/Src/Dlhis.Entity/Sys/Entities/TenantEntity.cs @@ -1,10 +1,12 @@ -using SqlSugar; +using Microsoft.Extensions.DependencyInjection; +using SqlSugar; namespace Dlhis.Entity.Sys.Entities; /// /// 租户 /// +[SkipScan] [SugarTable(TableName = "Tenants")] public class TenantEntity { diff --git a/Src/Dlhis.Entity/Sys/Entities/UserClaims.cs b/Src/Dlhis.Entity/Sys/Entities/UserClaimEntity.cs similarity index 76% rename from Src/Dlhis.Entity/Sys/Entities/UserClaims.cs rename to Src/Dlhis.Entity/Sys/Entities/UserClaimEntity.cs index fd9b494a..dd6c1613 100644 --- a/Src/Dlhis.Entity/Sys/Entities/UserClaims.cs +++ b/Src/Dlhis.Entity/Sys/Entities/UserClaimEntity.cs @@ -1,12 +1,14 @@ -using SqlSugar; +using Microsoft.Extensions.DependencyInjection; +using SqlSugar; namespace Dlhis.Entity.Sys.Entities; /// /// identity-userclaim /// +[SkipScan] [SugarTable(TableName = "UserClaims")] -public class UserClaims +public class UserClaimEntity { [SugarColumn(IsPrimaryKey = true, IsIdentity = true)] public int Id { get; set; } diff --git a/Src/Dlhis.Entity/Sys/Entities/UserEntity.cs b/Src/Dlhis.Entity/Sys/Entities/UserEntity.cs index 3c60c700..37bfdbb5 100644 --- a/Src/Dlhis.Entity/Sys/Entities/UserEntity.cs +++ b/Src/Dlhis.Entity/Sys/Entities/UserEntity.cs @@ -1,10 +1,12 @@ -using SqlSugar; +using Microsoft.Extensions.DependencyInjection; +using SqlSugar; namespace Dlhis.Entity.Sys.Entities; /// /// identity-user /// +[SkipScan] [SugarTable(TableName = "Users")] public class UserEntity {