解决GainfoService冲突

Src/Dlhis.Entity/Basic/Entity/DepartmentEntity.cs

@@ -0,0 +1,28 @@
+using SqlSugar;
+
+namespace Dlhis.Entity.Basic.Entity;
+
+/// <summary>
+/// 部门
+/// </summary>
+[SugarTable(TableName = "Department", TableDescription = "部门")]
+public class DepartmentEntity : SugarBaseEntity
+{
+    /// <summary>
+    /// 部门号
+    /// </summary>
+    [SugarColumn(ColumnDescription = "部门号")]
+    public string Code { get; set; }
+
+    /// <summary>
+    /// 上级部门号
+    /// </summary>
+    [SugarColumn(ColumnDescription = "上级部门号")]
+    public string PCode { get; set; }
+
+    /// <summary>
+    /// 部门名称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "部门名称")]
+    public string Name { get; set; }
+}

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

@@ -43,7 +43,7 @@ public class DeviceEntity : SugarBaseEntity, ITenantId
     /// <summary>
     /// 设备功能
     /// </summary>
-    [SugarColumn(ColumnDataType = "varchar(150)", IsJson = true, ColumnDescription = "设备功能")]
+    [SugarColumn(ColumnDataType = "varchar(150)", IsJson = true, ColumnDescription = "设备功能", DefaultValue = "[]")]
     public List<DeviceFuncEnumType> Funcs { get; set; }
 
     /// <summary>
@@ -95,12 +95,5 @@ public class DeviceEntity : SugarBaseEntity, ITenantId
     [SugarColumn(ColumnDataType = "bit", ColumnDescription = "是否启用")]
     public bool Enable { get; set; }
 
-    /// <summary>
-    /// 设别状态
-    /// </summary>
-    [SugarColumn(ColumnDescription = "设别状态")]
-    public string Status { get; set; }
-
-
     public string TenantId { get; set; }
 }

Src/Dlhis.Entity/Basic/Entity/WerkEntity.cs

@@ -0,0 +1,25 @@
+using SqlSugar;
+
+namespace Dlhis.Entity.Basic.Entity;
+
+[SugarTable(TableName = "Werk", TableDescription = "人事范围")]
+public class WerkEntity : SugarBaseEntity
+{
+    /// <summary>
+    /// 代号
+    /// </summary>
+    [SugarColumn(ColumnDescription = "代号")]
+    public string Code { get; set; }
+
+    /// <summary>
+    /// 名称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "名称")]
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 是否可见
+    /// </summary>
+    [SugarColumn(ColumnDescription = "是否可见", ColumnDataType = "bit")]
+    public bool Visible { get; set; }
+}