Ver código fonte

😁1、字典实体调整 2、升级Furion v4.8.8.49

zuohuaijun 2 anos atrás
pai
commit
0a97c578c6

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

@@ -22,9 +22,9 @@
     <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="6.0.15" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="FluentEmail.Smtp" Version="3.0.2" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.8.48" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.8.48" />
-    <PackageReference Include="Furion.Pure" Version="4.8.8.48" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.8.49" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.8.49" />
+    <PackageReference Include="Furion.Pure" Version="4.8.8.49" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.0.6" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.7.4.5" />

+ 14 - 14
Admin.NET/Admin.NET.Core/Entity/SysDictData.cs

@@ -43,25 +43,25 @@ public class SysDictData : EntityBase
     public virtual string Code { get; set; }
 
     /// <summary>
-    /// 标签颜色
+    /// 显示样式-标签颜色
     /// </summary>
-    [SugarColumn(ColumnDescription = "标签颜色", Length = 12, IsNullable = true)]
-    [MaxLength(12)]
-    public string TagType { get; set; }
+    [SugarColumn(ColumnDescription = "显示样式-标签颜色", Length = 16)]
+    [MaxLength(16)]
+    public string? TagType { get; set; }
 
     /// <summary>
-    /// Style(允许在字典中直接控制显示样式)
+    /// 显示样式-Style(控制显示样式)
     /// </summary>
-    [SugarColumn(ColumnDescription = "Style", Length = 512, IsNullable = true)]
+    [SugarColumn(ColumnDescription = "显示样式-Style", Length = 512)]
     [MaxLength(512)]
-    public string StyleSetting { get; set; }
+    public string? StyleSetting { get; set; }
 
     /// <summary>
-    /// Class(允许在字典中直接控制显示样式)
+    /// 显示样式-Class(控制显示样式)
     /// </summary>
-    [SugarColumn(ColumnDescription = "Class", Length = 512, IsNullable = true)]
+    [SugarColumn(ColumnDescription = "显示样式-Class", Length = 512)]
     [MaxLength(512)]
-    public string ClassSetting { get; set; }
+    public string? ClassSetting { get; set; }
 
     /// <summary>
     /// 排序
@@ -74,13 +74,13 @@ public class SysDictData : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "备注", Length = 2048)]
     [MaxLength(2048)]
-    public string Remark { get; set; }
+    public string? Remark { get; set; }
 
     /// <summary>
-    /// 拓展数据(可用于保存一些业务功能的配置项)
+    /// 拓展数据(保存业务功能的配置项)
     /// </summary>
-    [SugarColumn(ColumnDescription = "拓展数据(可用于保存一些业务功能的配置项)", IsNullable = true, ColumnDataType = SqlSugar.StaticConfig.CodeFirst_BigString)]
-    public string ExtData { get; set; }
+    [SugarColumn(ColumnDescription = "拓展数据(保存业务功能的配置项)", ColumnDataType = StaticConfig.CodeFirst_BigString)]
+    public string? ExtData { get; set; }
 
     /// <summary>
     /// 状态