MealUsersController冲突

Src/Dlhis.Entity/Sys/Entities/DevicePermissionEntity.cs

@@ -1,8 +1,8 @@
-using Dlhis.Entity.Permission.Enums;
+using Dlhis.Entity.Sys.Enums;
 using Kurisu.Core.DataAccess.Entity;
 using SqlSugar;
 
-namespace Dlhis.Entity.Permission.Entities;
+namespace Dlhis.Entity.Sys.Entities;
 
 /// <summary>
 /// 设备权限

Src/Dlhis.Entity/Sys/Entities/MenuEntity.cs

@@ -1,8 +1,8 @@
-using Dlhis.Entity.Permission.Enums;
+using Dlhis.Entity.Sys.Enums;
 using SqlSugar;
 using SqlSugar.DbConvert;
 
-namespace Dlhis.Entity.Permission.Entities;
+namespace Dlhis.Entity.Sys.Entities;
 
 /// <summary>
 /// 菜单

Src/Dlhis.Entity/Sys/Entities/MenuPermissionEntity.cs

@@ -1,9 +1,9 @@
-using Dlhis.Entity.Permission.Enums;
+using Dlhis.Entity.Sys.Enums;
 using Kurisu.Core.DataAccess.Entity;
 using SqlSugar;
 using SqlSugar.DbConvert;
 
-namespace Dlhis.Entity.Permission.Entities;
+namespace Dlhis.Entity.Sys.Entities;
 
 /// <summary>
 /// 菜单权限

Src/Dlhis.Entity/Sys/Entities/RoleEntity.cs

@@ -0,0 +1,16 @@
+using SqlSugar;
+
+namespace Dlhis.Entity.Sys.Entities;
+
+[SugarTable(TableName = "Roles")]
+public class RoleEntity
+{
+    [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+    public int Id { get; set; }
+
+    public string Name { get; set; }
+
+    public string NormalizedName { get; set; }
+
+    public string ConcurrencyStamp { get; set; }
+}

Src/Dlhis.Entity/Sys/Entities/UserEntity.cs

@@ -0,0 +1,38 @@
+using SqlSugar;
+
+namespace Dlhis.Entity.Sys.Entities;
+
+[SugarTable("Users")]
+public class UserEntity
+{
+    [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+    public int Id { get; set; }
+
+    public string UserName { get; set; }
+
+    public string NormalizedUserName { get; set; }
+
+    public string Email { get; set; }
+
+    public string NormalizedEmail { get; set; }
+
+    public bool EmailConfirmed { get; set; }
+
+    public string PasswordHash { get; set; }
+
+    public string SecurityStamp { get; set; }
+
+    public string ConcurrencyStamp { get; set; }
+
+    public string PhoneNumber { get; set; }
+
+    public string PhoneNumberConfirmed { get; set; }
+
+    public bool TwoFactorEnabled { get; set; }
+
+    public bool LockoutEnd { get; set; }
+
+    public bool LockoutEnabled { get; set; }
+
+    public int AccessFailedCount { get; set; }
+}

Src/Dlhis.Entity/Sys/Enums/DevicePermissionTypeEnumType.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace Dlhis.Entity.Permission.Enums;
+namespace Dlhis.Entity.Sys.Enums;
 
 /// <summary>
 /// 设备权限类型

Src/Dlhis.Entity/Sys/Enums/MenuEnumType.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace Dlhis.Entity.Permission.Enums;
+namespace Dlhis.Entity.Sys.Enums;
 
 /// <summary>
 /// 菜单类型

Src/Dlhis.Entity/Sys/Enums/MenuPermissionTypeEnumType.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace Dlhis.Entity.Permission.Enums;
+namespace Dlhis.Entity.Sys.Enums;
 
 /// <summary>
 /// 权限类型

Src/Dlhis.Entity/Sys/Enums/PlatformEnumType.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace Dlhis.Entity.Permission.Enums;
+namespace Dlhis.Entity.Sys.Enums;
 
 /// <summary>
 /// 平台类型