Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

system/Tnb.Systems.Entitys/Dto/System/DictionaryType/DictionaryTypeInfoOutput.cs

@@ -1,4 +1,5 @@
 using JNPF.DependencyInjection;
+using JNPF.Systems.Entitys.Dto.DictionaryData;
 
 namespace JNPF.Systems.Entitys.Dto.DictionaryType;
 
@@ -42,4 +43,7 @@ public class DictionaryTypeInfoOutput
     /// 排序.
     /// </summary>
     public long? sortCode { get; set; }
+
+    public List<DictionaryDataInfoOutput> items { get; set; }
+
 }

system/Tnb.Systems.Entitys/Enum/AreaType.cs

@@ -0,0 +1,26 @@
+using JNPF.DependencyInjection;
+using System.ComponentModel;
+
+namespace JNPF.Systems.Entitys.Enum;
+
+/// <summary>
+/// 区域类型.
+/// </summary>
+[SuppressSniffer]
+public enum AreaType
+{
+    [Description("公司")]
+    company,
+    [Description("工厂")]
+    factory,
+    [Description("部门")]
+    department,
+    [Description("车间")]
+    workshop,
+    [Description("工作中心")]
+    workgroup,
+    [Description("工位")]
+    workstation,
+    [Description("产线")]
+    workline
+}