diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/BootstrapAdminContext.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/BootstrapAdminContext.cs
index 71268bed..1e69ec14 100644
--- a/src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/BootstrapAdminContext.cs
+++ b/src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/BootstrapAdminContext.cs
@@ -1,4 +1,5 @@
-using BootstrapAdmin.DataAccess.Models;
+using BootstrapAdmin.DataAccess.EFCore.Models;
+using BootstrapAdmin.DataAccess.Models;
 using Microsoft.EntityFrameworkCore;
 
 namespace BootstrapAdmin.DataAccess.EFCore
@@ -27,13 +28,13 @@ namespace BootstrapAdmin.DataAccess.EFCore
         /// 
         /// </summary>
         [NotNull]
-        public DbSet<User>? Users { get; set; }
+        public DbSet<EFUser>? Users { get; set; }
 
         /// <summary>
         /// 
         /// </summary>
         [NotNull]
-        public DbSet<Role>? Roles { get; set; }
+        public DbSet<EFRole>? Roles { get; set; }
 
         /// <summary>
         /// 
@@ -45,7 +46,7 @@ namespace BootstrapAdmin.DataAccess.EFCore
         /// 
         /// </summary>
         [NotNull]
-        public DbSet<Navigation>? Navigations { get; set; }
+        public DbSet<EFNavigation>? Navigations { get; set; }
 
         /// <summary>
         /// 
@@ -57,7 +58,7 @@ namespace BootstrapAdmin.DataAccess.EFCore
         /// 
         /// </summary>
         [NotNull]
-        public DbSet<Group>? Groups { get; set; }
+        public DbSet<EFGroup>? Groups { get; set; }
 
         /// <summary>
         /// 
diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Models/EFGroup.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Models/EFGroup.cs
new file mode 100644
index 00000000..857a34b8
--- /dev/null
+++ b/src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Models/EFGroup.cs
@@ -0,0 +1,26 @@
+using BootstrapAdmin.DataAccess.Models;
+
+namespace BootstrapAdmin.DataAccess.EFCore.Models;
+
+public class EFGroup : Group
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public ICollection<User>? Users { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public ICollection<UserGroup>? UserGroup { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public ICollection<Role>? Roles { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public List<RoleGroup>? RoleGroup { get; set; }
+}
diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Models/EFNavigation.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Models/EFNavigation.cs
new file mode 100644
index 00000000..0f948fdb
--- /dev/null
+++ b/src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Models/EFNavigation.cs
@@ -0,0 +1,16 @@
+using BootstrapAdmin.DataAccess.Models;
+
+namespace BootstrapAdmin.DataAccess.EFCore.Models;
+
+public class EFNavigation : Navigation
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public ICollection<Role>? Roles { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public List<NavigationRole>? NavigationRoles { get; set; }
+}
diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Models/EFRole.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Models/EFRole.cs
new file mode 100644
index 00000000..0641fbcf
--- /dev/null
+++ b/src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Models/EFRole.cs
@@ -0,0 +1,37 @@
+using BootstrapAdmin.DataAccess.Models;
+
+namespace BootstrapAdmin.DataAccess.EFCore.Models;
+
+public class EFRole : Role
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public ICollection<User>? Users { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public List<UserRole>? UserRoles { get; set; }
+
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public ICollection<Navigation>? Navigations { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public List<NavigationRole>? NavigationRoles { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public ICollection<Group>? Groups { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public List<RoleGroup>? RoleGroup { get; set; }
+}
diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Models/EFUser.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Models/EFUser.cs
new file mode 100644
index 00000000..cb4e8df1
--- /dev/null
+++ b/src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Models/EFUser.cs
@@ -0,0 +1,26 @@
+using BootstrapAdmin.DataAccess.Models;
+
+namespace BootstrapAdmin.DataAccess.EFCore.Models;
+
+public class EFUser : User
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public ICollection<Role>? Roles { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public List<UserRole>? UserRoles { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public ICollection<Group>? Groups { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public ICollection<UserGroup>? UserGroup { get; set; }
+}
diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.Models/NavigationRole.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Models/NavigationRole.cs
similarity index 83%
rename from src/blazor/admin/BootstrapAdmin.DataAccess.Models/NavigationRole.cs
rename to src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Models/NavigationRole.cs
index 2a306c15..52d34132 100644
--- a/src/blazor/admin/BootstrapAdmin.DataAccess.Models/NavigationRole.cs
+++ b/src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Models/NavigationRole.cs
@@ -1,4 +1,6 @@
-namespace BootstrapAdmin.DataAccess.Models;
+using BootstrapAdmin.DataAccess.Models;
+
+namespace BootstrapAdmin.DataAccess.EFCore.Models;
 
 public class NavigationRole
 {
diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.Models/RoleGroup.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Models/RoleGroup.cs
similarity index 57%
rename from src/blazor/admin/BootstrapAdmin.DataAccess.Models/RoleGroup.cs
rename to src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Models/RoleGroup.cs
index 4bf58b04..d252b5a3 100644
--- a/src/blazor/admin/BootstrapAdmin.DataAccess.Models/RoleGroup.cs
+++ b/src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Models/RoleGroup.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using BootstrapAdmin.DataAccess.Models;
 
-namespace BootstrapAdmin.DataAccess.Models;
+namespace BootstrapAdmin.DataAccess.EFCore.Models;
 
 public class RoleGroup
 {
diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.Models/UserGroup.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Models/UserGroup.cs
similarity index 73%
rename from src/blazor/admin/BootstrapAdmin.DataAccess.Models/UserGroup.cs
rename to src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Models/UserGroup.cs
index c1dcf576..19bb7fb2 100644
--- a/src/blazor/admin/BootstrapAdmin.DataAccess.Models/UserGroup.cs
+++ b/src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Models/UserGroup.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using BootstrapAdmin.DataAccess.Models;
 
-namespace BootstrapAdmin.DataAccess.Models;
+namespace BootstrapAdmin.DataAccess.EFCore.Models;
 
 public class UserGroup
 {
diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.Models/UserRole.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Models/UserRole.cs
similarity index 82%
rename from src/blazor/admin/BootstrapAdmin.DataAccess.Models/UserRole.cs
rename to src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Models/UserRole.cs
index 8e5ac207..3a3d3a21 100644
--- a/src/blazor/admin/BootstrapAdmin.DataAccess.Models/UserRole.cs
+++ b/src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Models/UserRole.cs
@@ -1,4 +1,6 @@
-namespace BootstrapAdmin.DataAccess.Models;
+using BootstrapAdmin.DataAccess.Models;
+
+namespace BootstrapAdmin.DataAccess.EFCore.Models;
 
 public class UserRole
 {
diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Services/UserService.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Services/UserService.cs
index 05a0e560..70640858 100644
--- a/src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Services/UserService.cs
+++ b/src/blazor/admin/BootstrapAdmin.DataAccess.EFCore/Services/UserService.cs
@@ -16,7 +16,7 @@ public class UserService : IUser
 
     public UserService(IDbContextFactory<BootstrapAdminContext> factory) => DbFactory = factory;
 
-    public List<User> GetAll()
+    public IEnumerable<User> GetAll()
     {
         using var context = DbFactory.CreateDbContext();
         return context.Users.ToList();
@@ -76,7 +76,7 @@ public class UserService : IUser
         var group = dbcontext.Groups.Include(s => s.Users).Where(s => s.Id == groupId).FirstOrDefault();
         if (group != null)
         {
-            group.Users = dbcontext.Users.Where(s => userIds.Contains(s.Id)).ToList();
+            group.Users = dbcontext.Users.Where(s => userIds.Contains(s.Id));
             return dbcontext.SaveChanges() > 0;
         }
         else
diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.Models/Group.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.Models/Group.cs
index 3b1d10d5..b425f218 100644
--- a/src/blazor/admin/BootstrapAdmin.DataAccess.Models/Group.cs
+++ b/src/blazor/admin/BootstrapAdmin.DataAccess.Models/Group.cs
@@ -32,26 +32,6 @@ namespace BootstrapAdmin.DataAccess.Models
         [Display(Name = "群组描述")]
         public string? Description { get; set; }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public ICollection<User>? Users { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public ICollection<UserGroup>? UserGroup { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public ICollection<Role>? Roles { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public List<RoleGroup>? RoleGroup { get; set; }
-
         public override string ToString() => $"{GroupName} ({GroupCode})";
     }
 }
diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.Models/Navigation.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.Models/Navigation.cs
index 0528f131..4d6bc9ed 100644
--- a/src/blazor/admin/BootstrapAdmin.DataAccess.Models/Navigation.cs
+++ b/src/blazor/admin/BootstrapAdmin.DataAccess.Models/Navigation.cs
@@ -73,15 +73,5 @@ namespace BootstrapAdmin.DataAccess.Models
         /// 
         /// </summary>
         public bool HasChildren { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public ICollection<Role>? Roles { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public List<NavigationRole>? NavigationRoles { get; set; }
     }
 }
diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.Models/Role.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.Models/Role.cs
index ccd566e7..7a262c5a 100644
--- a/src/blazor/admin/BootstrapAdmin.DataAccess.Models/Role.cs
+++ b/src/blazor/admin/BootstrapAdmin.DataAccess.Models/Role.cs
@@ -26,36 +26,5 @@ namespace BootstrapAdmin.DataAccess.Models
         [DisplayName("角色描述")]
         [NotNull]
         public string? Description { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public ICollection<User>? Users { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public List<UserRole>? UserRoles { get; set; }
-
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public ICollection<Navigation>? Navigations { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public List<NavigationRole>? NavigationRoles { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public ICollection<Group>? Groups { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public List<RoleGroup>? RoleGroup { get; set; }
     }
 }
diff --git a/src/blazor/admin/BootstrapAdmin.DataAccess.Models/User.cs b/src/blazor/admin/BootstrapAdmin.DataAccess.Models/User.cs
index 3f95ed8f..7fdfad86 100644
--- a/src/blazor/admin/BootstrapAdmin.DataAccess.Models/User.cs
+++ b/src/blazor/admin/BootstrapAdmin.DataAccess.Models/User.cs
@@ -107,26 +107,6 @@ namespace BootstrapAdmin.DataAccess.Models
         /// </summary>
         public int IsReset { get; set; }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public ICollection<Role>? Roles { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public List<UserRole>? UserRoles { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public ICollection<Group>? Groups { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public ICollection<UserGroup>? UserGroup { get; set; }
-
         /// <summary>
         /// 获得/设置 默认格式为 DisplayName (UserName)
         /// </summary>
diff --git a/src/blazor/admin/BootstrapAdmin.Web/BootstrapAdmin.Web.csproj b/src/blazor/admin/BootstrapAdmin.Web/BootstrapAdmin.Web.csproj
index d2b3b70d..efa038d5 100644
--- a/src/blazor/admin/BootstrapAdmin.Web/BootstrapAdmin.Web.csproj
+++ b/src/blazor/admin/BootstrapAdmin.Web/BootstrapAdmin.Web.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\BootstrapAdmin.DataAccess.EFCore\BootstrapAdmin.DataAccess.EFCore.csproj" />
+    <ProjectReference Include="..\BootstrapAdmin.DataAccess.PetaPoco\BootstrapAdmin.DataAccess.PetaPoco.csproj" />
     <ProjectReference Include="..\BootstrapAdmin.Extensions\BootstrapAdmin.Extensions.csproj" />
   </ItemGroup>
 
diff --git a/src/blazor/admin/BootstrapAdmin.Web/Extensions/ServicesExtensions.cs b/src/blazor/admin/BootstrapAdmin.Web/Extensions/ServicesExtensions.cs
index 4f776015..1adfb33c 100644
--- a/src/blazor/admin/BootstrapAdmin.Web/Extensions/ServicesExtensions.cs
+++ b/src/blazor/admin/BootstrapAdmin.Web/Extensions/ServicesExtensions.cs
@@ -2,7 +2,7 @@
 using BootstrapAdmin.Web.Services.SMS;
 using BootstrapAdmin.Web.Services.SMS.Tencent;
 using Longbow.Tasks;
-using Microsoft.EntityFrameworkCore;
+//using Microsoft.EntityFrameworkCore;
 using System.Text;
 
 namespace Microsoft.Extensions.DependencyInjection
@@ -75,15 +75,15 @@ namespace Microsoft.Extensions.DependencyInjection
             services.AddScoped<BootstrapAppContext>();
 
             // 增加 EFCore 数据服务
-            services.AddEFCoreDataAccessServices((provider, option) =>
-            {
-                var configuration = provider.GetRequiredService<IConfiguration>();
-                var connString = configuration.GetConnectionString("bb");
-                option.UseSqlite(connString);
-            });
+            //services.AddEFCoreDataAccessServices((provider, option) =>
+            //{
+            //    var configuration = provider.GetRequiredService<IConfiguration>();
+            //    var connString = configuration.GetConnectionString("bb");
+            //    option.UseSqlite(connString);
+            //});
 
             // 增加 PetaPoco 数据服务
-            //services.AddPetaPocoDataAccessServices();
+            services.AddPetaPocoDataAccessServices();
 
             // 增加后台任务
             services.AddTaskServices();