Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development

Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs

@@ -84,5 +84,12 @@ public class DeviceEntity : SugarBaseEntity, ITenantId
     [SugarColumn(ColumnDataType = "bit", ColumnDescription = "是否启用")]
     public bool Enable { get; set; }
 
+
+    /// <summary>
+    /// 是否作为考勤设备
+    /// </summary>
+    [SugarColumn(ColumnDataType = "bit", ColumnDescription = "是否作为考勤设备")]
+    public bool AsAttendance { get; set; }
+
     public string TenantId { get; set; }
 }

Src/Dlhis.Entity/Basic/Entity/GainfoGroupEntity.cs

@@ -1,4 +1,5 @@
-using Kurisu.SqlSugar;
+using Kurisu.Core.DataAccess.Entity;
+using Kurisu.SqlSugar;
 using SqlSugar;
 
 namespace Dlhis.Entity.Basic.Entity;
@@ -7,8 +8,13 @@ namespace Dlhis.Entity.Basic.Entity;
 /// 档案组
 /// </summary>
 [SugarTable(TableName = "GainfoGroup", TableDescription = "档案组")]
-public class GainfoGroupEntity : SugarBaseEntity
+public class GainfoGroupEntity : SugarBaseEntity, ITenantId
 {
+    /// <summary>
+    /// 父级Code
+    /// </summary>
+    public Guid? PCode { get; set; }
+
     /// <summary>
     /// 分组code
     /// </summary>
@@ -26,4 +32,19 @@ public class GainfoGroupEntity : SugarBaseEntity
     /// </summary>
     [SugarColumn(ColumnDescription = "备注")]
     public string Remark { get; set; }
+
+    /// <summary>
+    /// 是否默认分组
+    /// </summary>
+    [SugarColumn(ColumnDescription = "是否默认分组")]
+    public bool IsDefault { get; set; }
+
+    /// <summary>
+    /// 是否可编辑
+    /// </summary>
+    [SugarColumn(ColumnDescription = "是否可编辑")]
+    public bool Editable { get; set; }
+
+
+    public string TenantId { get; set; }
 }

Src/Dlhis.Entity/Device/Entities/DeviceGroupEntity.cs

@@ -12,7 +12,6 @@ namespace Dlhis.Entity.Device.Entities;
 [SugarTable(TableName = "DeviceGroup", TableDescription = "设备组")]
 public class DeviceGroupEntity : SugarBaseEntity, ITenantId, ISoftDeleted
 {
-
     /// <summary>
     /// 设备组功能类型
     /// </summary>

Src/Dlhis.Entity/Device/Enums/DeviceTypeEnumType.cs

@@ -25,10 +25,4 @@ public enum DeviceTypeEnumType
     /// </summary>
     [Description("考勤")]
     Attendance = 3,
-
-    /// <summary>
-    /// 门禁并作为考勤
-    /// </summary>
-    [Description("门禁并作为考勤")]
-    DoorAndAttendance = 4,
 }