diff --git a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs
index e8934f50..9ac751e5 100644
--- a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs
+++ b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs
@@ -23,7 +23,7 @@ public class BalancesController : ControllerBase
}
///
- /// 获取消费记录
+ /// 获取记录分页
///
///
///
diff --git a/Src/Dlhis.Entity/Basic/Entity/GainfoGroupEntity.cs b/Src/Dlhis.Entity/Basic/Entity/GainfoGroupEntity.cs
new file mode 100644
index 00000000..2243b9e5
--- /dev/null
+++ b/Src/Dlhis.Entity/Basic/Entity/GainfoGroupEntity.cs
@@ -0,0 +1,29 @@
+using Kurisu.SqlSugar;
+using SqlSugar;
+
+namespace Dlhis.Entity.Basic.Entity;
+
+///
+/// 档案组
+///
+[SugarTable(TableName = "GainfoGroup", TableDescription = "档案组")]
+public class GainfoGroupEntity : SugarBaseEntity
+{
+ ///
+ /// 分组code
+ ///
+ [SugarColumn(ColumnDescription = "分组code")]
+ public Guid Code { get; set; }
+
+ ///
+ /// 名称
+ ///
+ [SugarColumn(ColumnDescription = "名称")]
+ public string Name { get; set; }
+
+ ///
+ /// 备注
+ ///
+ [SugarColumn(ColumnDescription = "备注")]
+ public string Remark { get; set; }
+}
diff --git a/Src/Dlhis.Entity/Basic/Entity/GainfoGroupRelationshipEntity.cs b/Src/Dlhis.Entity/Basic/Entity/GainfoGroupRelationshipEntity.cs
new file mode 100644
index 00000000..a8747085
--- /dev/null
+++ b/Src/Dlhis.Entity/Basic/Entity/GainfoGroupRelationshipEntity.cs
@@ -0,0 +1,22 @@
+using Kurisu.SqlSugar;
+using SqlSugar;
+
+namespace Dlhis.Entity.Basic.Entity;
+
+///
+/// 档案人员组关系
+///
+[SugarTable(TableName = "GainfoGroupRelationship", TableDescription = "档案人员组关系")]
+public class GainfoGroupRelationshipEntity : SugarBaseEntity
+{
+ ///
+ /// 分组code
+ ///
+ public Guid GroupCode { get; set; }
+
+ ///
+ /// 人员档案号
+ ///
+ [SugarColumn(ColumnDescription = "人员档案号")]
+ public string UserNo { get; set; }
+}
diff --git a/Src/Dlhis.Entity/Sys/Entities/DevicePermissionEntity.cs b/Src/Dlhis.Entity/Sys/Entities/DevicePermissionEntity.cs
index c6f98596..cb4e2e0f 100644
--- a/Src/Dlhis.Entity/Sys/Entities/DevicePermissionEntity.cs
+++ b/Src/Dlhis.Entity/Sys/Entities/DevicePermissionEntity.cs
@@ -13,10 +13,17 @@ namespace Dlhis.Entity.Sys.Entities;
public class DevicePermissionEntity : SugarBaseEntity, ITenantId, ISoftDeleted
{
///
- /// 人员档案
+ /// 分配权限类型
///
- [SugarColumn(ColumnDescription = "人员档案")]
- public string UserNo { get; set; }
+ [SugarColumn(ColumnDataType = "varchar(50)", ColumnDescription = "分配权限类型", SqlParameterDbType = typeof(EnumToStringConvert))]
+ public AssignTypeEnumType AssignType { get; set; }
+
+ ///
+ /// 分配值
+ ///
+ [SugarColumn(ColumnDescription = "分配值")]
+ public string AssignValue { get; set; }
+
///
/// 设备权限类型
diff --git a/Src/Dlhis.Entity/Sys/Entities/MenuPermissionEntity.cs b/Src/Dlhis.Entity/Sys/Entities/MenuPermissionEntity.cs
index 33133cf2..67d38089 100644
--- a/Src/Dlhis.Entity/Sys/Entities/MenuPermissionEntity.cs
+++ b/Src/Dlhis.Entity/Sys/Entities/MenuPermissionEntity.cs
@@ -16,7 +16,7 @@ public class MenuPermissionEntity : SugarBaseEntity, ITenantId, ISoftDeleted
/// 权限分配类型
///
[SugarColumn(ColumnDataType = "varchar(50)", ColumnDescription = "权限分配类型", SqlParameterDbType = typeof(EnumToStringConvert))]
- public MenuAssignmentTypeEnumType UniqueType { get; set; }
+ public AssignTypeEnumType UniqueType { get; set; }
///
/// 类型值
diff --git a/Src/Dlhis.Entity/Sys/Enums/MenuAssignmentTypeEnumType.cs b/Src/Dlhis.Entity/Sys/Enums/AssignTypeEnumType.cs
similarity index 71%
rename from Src/Dlhis.Entity/Sys/Enums/MenuAssignmentTypeEnumType.cs
rename to Src/Dlhis.Entity/Sys/Enums/AssignTypeEnumType.cs
index 0d70d4b4..f41385d5 100644
--- a/Src/Dlhis.Entity/Sys/Enums/MenuAssignmentTypeEnumType.cs
+++ b/Src/Dlhis.Entity/Sys/Enums/AssignTypeEnumType.cs
@@ -5,8 +5,8 @@ namespace Dlhis.Entity.Sys.Enums;
///
/// 权限类型
///
-[Description("权限分配类型")]
-public enum MenuAssignmentTypeEnumType
+[Description("分配类型")]
+public enum AssignTypeEnumType
{
///
/// 用户
@@ -30,5 +30,11 @@ public enum MenuAssignmentTypeEnumType
/// 部门
///
[Description("部门")]
- Department = 4
+ Department = 4,
+
+ ///
+ /// 租户/基地
+ ///
+ [Description("租户/基地")]
+ Tenant = 5,
}