diff --git a/Yi.Framework.Net6/Yi.Framework.Core/Yi.Framework.Core.csproj b/Yi.Framework.Net6/Yi.Framework.Core/Yi.Framework.Core.csproj
index a5773704..c8f401f9 100644
--- a/Yi.Framework.Net6/Yi.Framework.Core/Yi.Framework.Core.csproj
+++ b/Yi.Framework.Net6/Yi.Framework.Core/Yi.Framework.Core.csproj
@@ -41,8 +41,4 @@
-
-
-
-
diff --git a/Yi.Framework.Net6/Yi.Framework.Model/Models/BaseModel/BaseModelEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/Models/BaseModel/BaseModelEntity.cs
new file mode 100644
index 00000000..f2eb7432
--- /dev/null
+++ b/Yi.Framework.Net6/Yi.Framework.Model/Models/BaseModel/BaseModelEntity.cs
@@ -0,0 +1,59 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Yi.Framework.Model.Models
+{
+ public abstract class BaseModelEntity
+ {
+ public BaseModelEntity()
+ {
+ this.Id = Guid.NewGuid();
+ this.IsDeleted = false;
+ this.CreateTime = DateTime.Now;
+ }
+ ///
+ /// 1
+ ///
+ [SugarColumn(ColumnName = "Id", IsPrimaryKey = true)]
+ public Guid Id { get; set; }
+ ///
+ /// 创建者
+ ///
+ [SugarColumn(ColumnName = "CreateUser")]
+ public Guid? CreateUser { get; set; }
+ ///
+ /// 修改者
+ ///
+ [SugarColumn(ColumnName = "ModifyUser")]
+ public Guid? ModifyUser { get; set; }
+ ///
+ /// 创建时间
+ ///
+ [SugarColumn(ColumnName = "CreateTime")]
+ public DateTime? CreateTime { get; set; }
+ ///
+ /// 修改时间
+ ///
+ [SugarColumn(ColumnName = "ModifyTime")]
+ public DateTime? ModifyTime { get; set; }
+ ///
+ /// 删除者
+ ///
+ [SugarColumn(ColumnName = "DeleteUser")]
+ public Guid? DeleteUser { get; set; }
+ ///
+ /// 删除时间
+ ///
+ [SugarColumn(ColumnName = "DeleteTime")]
+ public DateTime? DeleteTime { get; set; }
+ ///
+ /// 是否删除
+ ///
+ [SugarColumn(ColumnName = "IsDeleted")]
+ public bool? IsDeleted { get; set; }
+ }
+}
diff --git a/Yi.Framework.Net6/Yi.Framework.Model/Models/UserEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/Models/UserEntity.cs
index c156f538..1bb0367e 100644
--- a/Yi.Framework.Net6/Yi.Framework.Model/Models/UserEntity.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Model/Models/UserEntity.cs
@@ -8,14 +8,8 @@ namespace Yi.Framework.Model.Models
/// 用户表
///
[SugarTable("User")]
- public partial class UserEntity
+ public partial class UserEntity:BaseModelEntity
{
- public UserEntity()
- {
- this.Id = Guid.NewGuid();
- this.IsDeleted=false;
- this.CreateTime = DateTime.Now;
- }
///
/// 1
///
diff --git a/Yi.Framework.Net6/Yi.Framework.Repository/IRepository.cs b/Yi.Framework.Net6/Yi.Framework.Repository/IRepository.cs
index 61ea7e37..c7eeabac 100644
--- a/Yi.Framework.Net6/Yi.Framework.Repository/IRepository.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Repository/IRepository.cs
@@ -6,11 +6,12 @@ using System.Linq.Expressions;
using System.Text;
using System.Threading.Tasks;
using Yi.Framework.Common.Models;
+using Yi.Framework.Model.Models;
using Yi.Framework.Model.Query;
namespace Yi.Framework.Repository
{
- public interface IRepository : ISimpleClient where T : class, new()
+ public interface IRepository : ISimpleClient where T : BaseModelEntity,new()
{
public Task InsertReturnEntityAsync(T entity);
public Task> StoreAsync(string storeName, object para);
diff --git a/Yi.Framework.Net6/Yi.Framework.Repository/Repository.cs b/Yi.Framework.Net6/Yi.Framework.Repository/Repository.cs
index 5237b7a4..93c4da66 100644
--- a/Yi.Framework.Net6/Yi.Framework.Repository/Repository.cs
+++ b/Yi.Framework.Net6/Yi.Framework.Repository/Repository.cs
@@ -2,6 +2,7 @@
using System.Data;
using System.Linq.Expressions;
using Yi.Framework.Common.Models;
+using Yi.Framework.Model.Models;
using Yi.Framework.Model.Query;
/***这里面写的代码不会给覆盖,如果要重新生成请删除 Repository.cs ***/
@@ -11,7 +12,7 @@ namespace Yi.Framework.Repository
/// 仓储模式
///
///
- public class Repository : DataContext, IRepository where T : class, new()
+ public class Repository : DataContext, IRepository where T : BaseModelEntity,new()
{
///