diff --git a/Api/Dilon.Core/Entity/DEntityBase.cs b/Api/Dilon.Core/Entity/DEntityBase.cs index 6d986f2..cf7ed80 100644 --- a/Api/Dilon.Core/Entity/DEntityBase.cs +++ b/Api/Dilon.Core/Entity/DEntityBase.cs @@ -18,7 +18,7 @@ namespace Dilon.Core [Key] [DatabaseGenerated(DatabaseGeneratedOption.None)] [Comment("Id主键")] - [Column("Id主键", TypeName = "varchar(36)")] + [Column("Id", TypeName = "varchar(36)")] public virtual string Id { get; set; } = Guid.NewGuid().ToString(); /// @@ -37,7 +37,7 @@ namespace Dilon.Core /// 创建者Id /// [Comment("创建者Id")] - [Column("创建者Id", TypeName = "varchar(36)")] + [Column("CreatedUserId", TypeName = "varchar(36)")] public virtual string CreatedUserId { get; set; } /// @@ -51,7 +51,7 @@ namespace Dilon.Core /// 修改者Id /// [Comment("修改者Id")] - [Column("修改者Id", TypeName = "varchar(36)")] + [Column("UpdatedUserId", TypeName = "varchar(36)")] public virtual string UpdatedUserId { get; set; } /// @@ -66,7 +66,7 @@ namespace Dilon.Core /// [JsonIgnore, FakeDelete(true)] [Comment("软删除标记")] - [Column("软删除标记", TypeName = "bit")] + [Column("IsDeleted", TypeName = "bit")] public virtual bool IsDeleted { get; set; } = false; } } diff --git a/Api/Dilon.Core/Entity/SysApp.cs b/Api/Dilon.Core/Entity/SysApp.cs index 9bad1fe..a86c84c 100644 --- a/Api/Dilon.Core/Entity/SysApp.cs +++ b/Api/Dilon.Core/Entity/SysApp.cs @@ -39,7 +39,7 @@ namespace Dilon.Core /// 用户登录后默认展示此系统菜单 /// [Comment("是否默认激活")] - [Column("是否默认激活", TypeName = "bit")] + [Column("Active", TypeName = "bit")] public bool Active { get; set; } /// diff --git a/Api/Dilon.Core/Entity/SysCodeGenConfig.cs b/Api/Dilon.Core/Entity/SysCodeGenConfig.cs index 68678da..7cba823 100644 --- a/Api/Dilon.Core/Entity/SysCodeGenConfig.cs +++ b/Api/Dilon.Core/Entity/SysCodeGenConfig.cs @@ -14,7 +14,7 @@ namespace Dilon.Core /// 代码生成主表ID /// [Comment("代码生成主表ID")] - [Column("代码生成主表ID", TypeName = "varchar(36)")] + [Column("CodeGenId", TypeName = "varchar(36)")] public string CodeGenId { get; set; } /// diff --git a/Api/Dilon.Core/Entity/SysDictData.cs b/Api/Dilon.Core/Entity/SysDictData.cs index 11937b6..caa5e9c 100644 --- a/Api/Dilon.Core/Entity/SysDictData.cs +++ b/Api/Dilon.Core/Entity/SysDictData.cs @@ -14,7 +14,7 @@ namespace Dilon.Core /// 字典类型Id /// [Comment("字典类型Id")] - [Column("字典类型Id", TypeName = "varchar(36)")] + [Column("TypeId", TypeName = "varchar(36)")] public string TypeId { get; set; } /// diff --git a/Api/Dilon.Core/Entity/SysEmp.cs b/Api/Dilon.Core/Entity/SysEmp.cs index ef55a1b..b31a67d 100644 --- a/Api/Dilon.Core/Entity/SysEmp.cs +++ b/Api/Dilon.Core/Entity/SysEmp.cs @@ -19,7 +19,7 @@ namespace Dilon.Core /// [DatabaseGenerated(DatabaseGeneratedOption.None)] [Comment("用户Id")] - [Column("用户Id", TypeName = "varchar(36)")] + [Column("Id", TypeName = "varchar(36)")] public string Id { get; set; } /// @@ -32,7 +32,7 @@ namespace Dilon.Core /// 机构Id /// [Comment("机构Id")] - [Column("机构Id", TypeName = "varchar(36)")] + [Column("OrgId", TypeName = "varchar(36)")] public string OrgId { get; set; } /// diff --git a/Api/Dilon.Core/Entity/SysEmpExtOrgPos.cs b/Api/Dilon.Core/Entity/SysEmpExtOrgPos.cs index 2b8ee21..408914c 100644 --- a/Api/Dilon.Core/Entity/SysEmpExtOrgPos.cs +++ b/Api/Dilon.Core/Entity/SysEmpExtOrgPos.cs @@ -18,7 +18,7 @@ namespace Dilon.Core /// 员工Id /// [Comment("员工Id")] - [Column("员工Id", TypeName = "varchar(36)")] + [Column("SysEmpId", TypeName = "varchar(36)")] public string SysEmpId { get; set; } /// @@ -30,7 +30,7 @@ namespace Dilon.Core /// 机构Id /// [Comment("机构Id")] - [Column("机构Id", TypeName = "varchar(36)")] + [Column("SysOrgId", TypeName = "varchar(36)")] public string SysOrgId { get; set; } /// @@ -42,7 +42,7 @@ namespace Dilon.Core /// 职位Id /// [Comment("职位Id")] - [Column("职位Id", TypeName = "varchar(36)")] + [Column("SysPosId", TypeName = "varchar(36)")] public string SysPosId { get; set; } /// diff --git a/Api/Dilon.Core/Entity/SysEmpPos.cs b/Api/Dilon.Core/Entity/SysEmpPos.cs index 5033186..93570cc 100644 --- a/Api/Dilon.Core/Entity/SysEmpPos.cs +++ b/Api/Dilon.Core/Entity/SysEmpPos.cs @@ -15,7 +15,7 @@ namespace Dilon.Core /// 员工Id /// [Comment("员工Id")] - [Column("员工Id", TypeName = "varchar(36)")] + [Column("SysEmpId", TypeName = "varchar(36)")] public string SysEmpId { get; set; } /// @@ -27,7 +27,7 @@ namespace Dilon.Core /// 职位Id /// [Comment("职位Id")] - [Column("职位Id", TypeName = "varchar(36)")] + [Column("SysPosId", TypeName = "varchar(36)")] public string SysPosId { get; set; } /// diff --git a/Api/Dilon.Core/Entity/SysLogAudit.cs b/Api/Dilon.Core/Entity/SysLogAudit.cs index 17da50f..07534ff 100644 --- a/Api/Dilon.Core/Entity/SysLogAudit.cs +++ b/Api/Dilon.Core/Entity/SysLogAudit.cs @@ -46,7 +46,7 @@ namespace Dilon.Core /// 操作人Id /// [Comment("操作人Id")] - [Column("操作人Id", TypeName = "varchar(36)")] + [Column("UserId", TypeName = "varchar(36)")] public string UserId { get; set; } /// diff --git a/Api/Dilon.Core/Entity/SysMenu.cs b/Api/Dilon.Core/Entity/SysMenu.cs index 9f2c1c9..f85ab77 100644 --- a/Api/Dilon.Core/Entity/SysMenu.cs +++ b/Api/Dilon.Core/Entity/SysMenu.cs @@ -15,7 +15,7 @@ namespace Dilon.Core /// 父Id /// [Comment("父Id")] - [Column("父Id", TypeName = "varchar(36)")] + [Column("Pid", TypeName = "varchar(36)")] public string Pid { get; set; } /// @@ -82,7 +82,7 @@ namespace Dilon.Core /// 是否可见(Y-是,N-否) /// [Comment("是否可见")] - [Column("是否可见", TypeName = "bit")] + [Column("Visible", TypeName = "bit")] public bool Visible { get; set; } = true; /// diff --git a/Api/Dilon.Core/Entity/SysNotice.cs b/Api/Dilon.Core/Entity/SysNotice.cs index 2226093..3ff6b81 100644 --- a/Api/Dilon.Core/Entity/SysNotice.cs +++ b/Api/Dilon.Core/Entity/SysNotice.cs @@ -33,7 +33,7 @@ namespace Dilon.Core /// 发布人Id /// [Comment("发布人Id")] - [Column("发布人Id", TypeName = "varchar(36)")] + [Column("PublicUserId", TypeName = "varchar(36)")] public string PublicUserId { get; set; } /// @@ -46,7 +46,7 @@ namespace Dilon.Core /// 发布机构Id /// [Comment("发布机构Id")] - [Column("发布机构Id", TypeName = "varchar(36)")] + [Column("PublicOrgId", TypeName = "varchar(36)")] public string PublicOrgId { get; set; } /// diff --git a/Api/Dilon.Core/Entity/SysNoticeUser.cs b/Api/Dilon.Core/Entity/SysNoticeUser.cs index cafcebc..232fbd5 100644 --- a/Api/Dilon.Core/Entity/SysNoticeUser.cs +++ b/Api/Dilon.Core/Entity/SysNoticeUser.cs @@ -17,14 +17,14 @@ namespace Dilon.Core /// 通知公告Id /// [Comment("通知公告Id")] - [Column("通知公告Id", TypeName = "varchar(36)")] + [Column("NoticeId", TypeName = "varchar(36)")] public string NoticeId { get; set; } /// /// 用户Id /// [Comment("用户Id")] - [Column("用户Id", TypeName = "varchar(36)")] + [Column("UserId", TypeName = "varchar(36)")] public string UserId { get; set; } ///