Explorar el Código

1、扩展组织机构 2、升级furion3.8.0

zuohuaijun hace 4 años
padre
commit
b7087341f4

+ 5 - 5
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -20,12 +20,12 @@
 
   <ItemGroup>
     <PackageReference Include="Caching.CSRedis" Version="3.8.3" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="3.7.11" />
-    <PackageReference Include="Furion.Extras.Logging.Serilog" Version="3.7.11" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="3.7.11" />
-    <PackageReference Include="Furion.Pure" Version="3.7.11" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="3.8.0" />
+    <PackageReference Include="Furion.Extras.Logging.Serilog" Version="3.8.0" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="3.8.0" />
+    <PackageReference Include="Furion.Pure" Version="3.8.0" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.6.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.7" />
     <PackageReference Include="MySql.Data" Version="8.0.29" />
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.6" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.16.0" />

+ 10 - 0
Admin.NET/Admin.NET.Core/Admin.NET.Core.xml

@@ -1055,6 +1055,11 @@
             状态
             </summary>
         </member>
+        <member name="P:Admin.NET.Core.SysOrg.Level">
+            <summary>
+            级别 例如:省、市、县、区
+            </summary>
+        </member>
         <member name="P:Admin.NET.Core.SysOrg.Children">
             <summary>
             机构子项
@@ -5237,6 +5242,11 @@
             状态
             </summary>
         </member>
+        <member name="P:Admin.NET.Core.Service.OrgInput.Level">
+            <summary>
+            级别 例如:省、市、县、区
+            </summary>
+        </member>
         <member name="P:Admin.NET.Core.Service.AddOrgInput.Name">
             <summary>
             名称

+ 2 - 2
Admin.NET/Admin.NET.Core/Entity/SysOrg.cs

@@ -46,10 +46,10 @@ public class SysOrg : EntityTenant
     public StatusEnum Status { get; set; } = StatusEnum.Enable;
 
     /// <summary>
-    /// 级别
-    /// 例:省、市、县、区
+    /// 级别 例如:省、市、县、区
     /// </summary>
     [SugarColumn(ColumnDescription = "级别")]
+    [MaxLength(20)]
     public string Level { get; set; }
 
     /// <summary>

+ 2 - 2
Admin.NET/Admin.NET.Core/SeedData/SysDictDataSeedData.cs

@@ -50,8 +50,8 @@ public class SysDictDataSeedData : ISqlSugarEntitySeedData<SysDictData>
 
             new SysDictData{ Id=269037953140001, DictTypeId=269037954200001, Value="省级", Code="省级", Order=1, Remark="省级", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysDictData{ Id=269037953140002, DictTypeId=269037954200001, Value="市级", Code="市级", Order=2, Remark="市级", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953140003, DictTypeId=269037954200001, Value="县级", Code="县级", Order=3, Remark="县级", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953140004, DictTypeId=269037954200001, Value="区级", Code="区级", Order=4, Remark="区级", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953140003, DictTypeId=269037954200001, Value="区级", Code="区级", Order=3, Remark="区级", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953140004, DictTypeId=269037954200001, Value="县级", Code="县级", Order=4, Remark="县级", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysDictData{ Id=269037953140005, DictTypeId=269037954200001, Value="其他", Code="其他", Order=5, Remark="其他", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
         };
     }

+ 1 - 2
Admin.NET/Admin.NET.Core/Service/Org/Dto/OrgInput.cs

@@ -33,8 +33,7 @@ public class OrgInput : BaseIdInput
     public virtual int Status { get; set; }
 
     /// <summary>
-    /// 级别
-    /// 例:省、市、县、区
+    /// 级别 例如:省、市、县、区
     /// </summary>
     public virtual string Level { get; set; }
 }