1、实体定义模式调整 2、其他问题修复升级

.gitignore

@@ -21,7 +21,6 @@ bin-release/
 /Admin.NET/Admin.NET.Web.Entry/publish
 /Admin.NET/Admin.NET.Web.Entry/logs
 /Admin.NET/Admin.NET.Web.Entry/wwwroot/Upload
-/Admin.NET/Admin.NET.Web.Entry/Properties/PublishProfiles/FolderProfile.pubxml.user
 
 # folders
 dist/
@@ -32,3 +31,4 @@ node_modules/
 /Admin.NET/Admin.NET.Web.Entry/*.db
 /Admin.NET/Admin.NET.Web.Core/Admin.NET.Web.Core.csproj.user
 /Admin.NET/Admin.NET.Web.Entry/Admin.NET.Web.Entry.csproj.user
+/Admin.NET/Admin.NET.Web.Entry/Properties/PublishProfiles

Admin.NET/Admin.NET.Application/Admin.NET.Application.csproj

@@ -2,9 +2,10 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <NoWarn>1701;1702;1591</NoWarn>
+    <NoWarn>1701;1702;1591;8632</NoWarn>
     <DocumentationFile></DocumentationFile>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
+    <Nullable>disable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>

Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -2,10 +2,11 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <NoWarn>1701;1702;1591</NoWarn>
+    <NoWarn>1701;1702;1591;8632</NoWarn>
     <DocumentationFile>Admin.NET.Core.xml</DocumentationFile>
     <ImplicitUsings>enable</ImplicitUsings>
     <PreserveCompilationContext>true</PreserveCompilationContext>
+    <Nullable>disable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
@@ -16,9 +17,9 @@
     <PackageReference Include="AngleSharp" Version="0.17.1" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="DotNetCore.Natasha.CSharp" Version="5.0.2" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.2.9" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.2.9" />
-    <PackageReference Include="Furion.Pure" Version="4.8.2.9" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.2.11" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.2.11" />
+    <PackageReference Include="Furion.Pure" Version="4.8.2.11" />
     <PackageReference Include="Lazy.Captcha.Core" Version="1.1.6" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.7.2" />
     <PackageReference Include="Magicodes.IE.Pdf" Version="2.7.2" />
@@ -27,13 +28,13 @@
     <PackageReference Include="NETCore.MailKit" Version="2.1.0" />
     <PackageReference Include="NewLife.Redis" Version="5.0.2022.1201" />
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.9" />
-    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.21.0" />
+    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.21.1" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.15.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.3.36" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.3.38" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.23" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
-    <PackageReference Include="Masuit.Tools.Core" Version="2.5.8.1" />
+    <PackageReference Include="Masuit.Tools.Core" Version="2.5.8.2" />
   </ItemGroup>
 
   <ItemGroup>

Admin.NET/Admin.NET.Core/Admin.NET.Core.xml

@@ -1834,7 +1834,7 @@
         </member>
         <member name="T:Admin.NET.Core.WeChatPay">
             <summary>
-            微信支付表
+            系统微信支付表
             </summary>
         </member>
         <member name="P:Admin.NET.Core.WeChatPay.MerchantId">
@@ -1959,7 +1959,7 @@
         </member>
         <member name="T:Admin.NET.Core.WeChatUser">
             <summary>
-            微信用户表
+            系统微信用户表
             </summary>
         </member>
         <member name="P:Admin.NET.Core.WeChatUser.UserId">
@@ -7209,6 +7209,13 @@
             </summary>
             <param name="db"></param>
         </member>
+        <member name="M:Admin.NET.Core.SqlSugarSetup.SetDbDiffLog(SqlSugar.SqlSugarScopeProvider,Admin.NET.Core.DbConnectionConfig)">
+            <summary>
+            开启库表差异化日志
+            </summary>
+            <param name="db"></param>
+            <param name="config"></param>
+        </member>
         <member name="M:Admin.NET.Core.SqlSugarSetup.InitDatabase(SqlSugar.SqlSugarScope,Admin.NET.Core.DbConnectionConfig)">
             <summary>
             初始化数据库

Admin.NET/Admin.NET.Core/Entity/SysCodeGen.cs

@@ -11,70 +11,70 @@ public class SysCodeGen : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "作者姓名", Length = 32)]
     [MaxLength(32)]
-    public string AuthorName { get; set; }
+    public string? AuthorName { get; set; }
 
     /// <summary>
     /// 是否移除表前缀
     /// </summary>
     [SugarColumn(ColumnDescription = "是否移除表前缀", Length = 8)]
     [MaxLength(8)]
-    public string TablePrefix { get; set; }
+    public string? TablePrefix { get; set; }
 
     /// <summary>
     /// 生成方式
     /// </summary>
     [SugarColumn(ColumnDescription = "生成方式", Length = 32)]
     [MaxLength(32)]
-    public string GenerateType { get; set; }
+    public string? GenerateType { get; set; }
 
     /// <summary>
     /// 库定位器名
     /// </summary>
     [SugarColumn(ColumnDescription = "库定位器名", Length = 64)]
     [MaxLength(64)]
-    public string ConfigId { get; set; }
+    public string? ConfigId { get; set; }
 
     /// <summary>
     /// 数据库名(保留字段)
     /// </summary>
     [SugarColumn(ColumnDescription = "数据库库名", Length = 64)]
     [MaxLength(64)]
-    public string DbName { get; set; }
+    public string? DbName { get; set; }
 
     /// <summary>
     /// 数据库类型
     /// </summary>
     [SugarColumn(ColumnDescription = "数据库类型", Length = 64)]
     [MaxLength(64)]
-    public string DbType { get; set; }
+    public string? DbType { get; set; }
 
     /// <summary>
     /// 数据库链接
     /// </summary>
     [SugarColumn(ColumnDescription = "数据库链接", Length = 256)]
     [MaxLength(256)]
-    public string ConnectionString { get; set; }
+    public string? ConnectionString { get; set; }
 
     /// <summary>
     /// 数据库表名
     /// </summary>
     [SugarColumn(ColumnDescription = "数据库表名", Length = 128)]
     [MaxLength(128)]
-    public string TableName { get; set; }
+    public string? TableName { get; set; }
 
     /// <summary>
     /// 命名空间
     /// </summary>
     [SugarColumn(ColumnDescription = "命名空间", Length = 128)]
     [MaxLength(128)]
-    public string NameSpace { get; set; }
+    public string? NameSpace { get; set; }
 
     /// <summary>
     /// 业务名
     /// </summary>
     [SugarColumn(ColumnDescription = "业务名", Length = 128)]
     [MaxLength(128)]
-    public string BusName { get; set; }
+    public string? BusName { get; set; }
 
     /// <summary>
     /// 菜单编码

Admin.NET/Admin.NET.Core/Entity/SysCodeGenConfig.cs

@@ -24,137 +24,137 @@ public class SysCodeGenConfig : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "字段描述", Length = 128)]
     [MaxLength(128)]
-    public string ColumnComment { get; set; }
+    public string? ColumnComment { get; set; }
 
     /// <summary>
     /// .NET数据类型
     /// </summary>
     [SugarColumn(ColumnDescription = "NET数据类型", Length = 64)]
     [MaxLength(64)]
-    public string NetType { get; set; }
+    public string? NetType { get; set; }
 
     /// <summary>
     /// 作用类型（字典）
     /// </summary>
     [SugarColumn(ColumnDescription = "作用类型", Length = 64)]
     [MaxLength(64)]
-    public string EffectType { get; set; }
+    public string? EffectType { get; set; }
 
     /// <summary>
     /// 外键实体名称
     /// </summary>
     [SugarColumn(ColumnDescription = "外键实体名称", Length = 64)]
     [MaxLength(64)]
-    public string FkEntityName { get; set; }
+    public string? FkEntityName { get; set; }
 
     /// <summary>
     /// 外键表名称
     /// </summary>
     [SugarColumn(ColumnDescription = "外键表名称", Length = 128)]
     [MaxLength(128)]
-    public string FkTableName { get; set; }
+    public string? FkTableName { get; set; }
 
     /// <summary>
     /// 外键显示字段
     /// </summary>
     [SugarColumn(ColumnDescription = "外键显示字段", Length = 64)]
     [MaxLength(64)]
-    public string FkColumnName { get; set; }
+    public string? FkColumnName { get; set; }
 
     /// <summary>
     /// 外键显示字段.NET类型
     /// </summary>
     [SugarColumn(ColumnDescription = "外键显示字段.NET类型", Length = 64)]
     [MaxLength(64)]
-    public string FkColumnNetType { get; set; }
+    public string? FkColumnNetType { get; set; }
 
     /// <summary>
     /// 字典编码
     /// </summary>
     [SugarColumn(ColumnDescription = "字典编码", Length = 64)]
     [MaxLength(64)]
-    public string DictTypeCode { get; set; }
+    public string? DictTypeCode { get; set; }
 
     /// <summary>
     /// 列表是否缩进（字典）
     /// </summary>
     [SugarColumn(ColumnDescription = "列表是否缩进", Length = 8)]
     [MaxLength(8)]
-    public string WhetherRetract { get; set; }
+    public string? WhetherRetract { get; set; }
 
     /// <summary>
     /// 是否必填（字典）
     /// </summary>
     [SugarColumn(ColumnDescription = "是否必填", Length = 8)]
     [MaxLength(8)]
-    public string WhetherRequired { get; set; }
+    public string? WhetherRequired { get; set; }
 
     /// <summary>
     /// 是否是查询条件
     /// </summary>
     [SugarColumn(ColumnDescription = "是否是查询条件", Length = 8)]
     [MaxLength(8)]
-    public string QueryWhether { get; set; }
+    public string? QueryWhether { get; set; }
 
     /// <summary>
     /// 查询方式
     /// </summary>
     [SugarColumn(ColumnDescription = "查询方式", Length = 16)]
     [MaxLength(16)]
-    public string QueryType { get; set; }
+    public string? QueryType { get; set; }
 
     /// <summary>
     /// 列表显示
     /// </summary>
     [SugarColumn(ColumnDescription = "列表显示", Length = 8)]
     [MaxLength(8)]
-    public string WhetherTable { get; set; }
+    public string? WhetherTable { get; set; }
 
     /// <summary>
     /// 增改
     /// </summary>
     [SugarColumn(ColumnDescription = "增改", Length = 8)]
     [MaxLength(8)]
-    public string WhetherAddUpdate { get; set; }
+    public string? WhetherAddUpdate { get; set; }
 
     /// <summary>
     /// 主键
     /// </summary>
     [SugarColumn(ColumnDescription = "主键", Length = 8)]
     [MaxLength(8)]
-    public string ColumnKey { get; set; }
+    public string? ColumnKey { get; set; }
 
     /// <summary>
     /// 数据库中类型（物理类型）
     /// </summary>
     [SugarColumn(ColumnDescription = "数据库中类型", Length = 64)]
     [MaxLength(64)]
-    public string DataType { get; set; }
+    public string? DataType { get; set; }
 
     /// <summary>
     /// 是否通用字段
     /// </summary>
     [SugarColumn(ColumnDescription = "是否通用字段", Length = 8)]
     [MaxLength(8)]
-    public string WhetherCommon { get; set; }
+    public string? WhetherCommon { get; set; }
 
     /// <summary>
     /// 显示文本字段
     /// </summary>
     [SugarColumn(ColumnDescription = "显示文本字段", ColumnDataType = "longtext,text,clob")]
-    public string DisplayColumn { get; set; }
+    public string? DisplayColumn { get; set; }
 
     /// <summary>
     /// 选中值字段
     /// </summary>
     [SugarColumn(ColumnDescription = "选中值字段", Length = 128)]
     [MaxLength(128)]
-    public string ValueColumn { get; set; }
+    public string? ValueColumn { get; set; }
 
     /// <summary>
     /// 父级字段
     /// </summary>
     [SugarColumn(ColumnDescription = "父级字段", Length = 128)]
     [MaxLength(128)]
-    public string PidColumn { get; set; }
+    public string? PidColumn { get; set; }
 }

Admin.NET/Admin.NET.Core/Entity/SysConfig.cs

@@ -18,14 +18,14 @@ public class SysConfig : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "编码", Length = 64)]
     [MaxLength(64)]
-    public string Code { get; set; }
+    public string? Code { get; set; }
 
     /// <summary>
     /// 属性值
     /// </summary>
     [SugarColumn(ColumnDescription = "属性值", Length = 64)]
     [MaxLength(64)]
-    public string Value { get; set; }
+    public string? Value { get; set; }
 
     /// <summary>
     /// 是否是内置参数（Y-是，N-否）
@@ -38,7 +38,7 @@ public class SysConfig : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "分组编码", Length = 64)]
     [MaxLength(64)]
-    public string GroupCode { get; set; }
+    public string? GroupCode { get; set; }
 
     /// <summary>
     /// 排序
@@ -51,5 +51,5 @@ public class SysConfig : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "备注", Length = 256)]
     [MaxLength(256)]
-    public string Remark { get; set; }
+    public string? Remark { get; set; }
 }

Admin.NET/Admin.NET.Core/Entity/SysDictData.cs

@@ -44,7 +44,7 @@ public class SysDictData : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "备注", Length = 128)]
     [MaxLength(128)]
-    public string Remark { get; set; }
+    public string? Remark { get; set; }
 
     /// <summary>
     /// 状态

Admin.NET/Admin.NET.Core/Entity/SysDictType.cs

@@ -31,7 +31,7 @@ public class SysDictType : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "备注", Length = 256)]
     [MaxLength(256)]
-    public string Remark { get; set; }
+    public string? Remark { get; set; }
 
     /// <summary>
     /// 状态

Admin.NET/Admin.NET.Core/Entity/SysFile.cs

@@ -11,54 +11,54 @@ public class SysFile : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "提供者", Length = 128)]
     [MaxLength(128)]
-    public string Provider { get; set; }
+    public string? Provider { get; set; }
 
     /// <summary>
     /// 仓储名称
     /// </summary>
     [SugarColumn(ColumnDescription = "仓储名称", Length = 128)]
     [MaxLength(128)]
-    public string BucketName { get; set; }
+    public string? BucketName { get; set; }
 
     /// <summary>
     /// 文件名称（上传时名称）
     /// </summary>文件名称
     [SugarColumn(ColumnDescription = "文件名称", Length = 128)]
     [MaxLength(128)]
-    public string FileName { get; set; }
+    public string? FileName { get; set; }
 
     /// <summary>
     /// 文件后缀
     /// </summary>
     [SugarColumn(ColumnDescription = "文件后缀", Length = 16)]
     [MaxLength(16)]
-    public string Suffix { get; set; }
+    public string? Suffix { get; set; }
 
     /// <summary>
     /// 存储路径
     /// </summary>
     [SugarColumn(ColumnDescription = "存储路径", Length = 128)]
     [MaxLength(128)]
-    public string FilePath { get; set; }
+    public string? FilePath { get; set; }
 
     /// <summary>
     /// 文件大小KB
     /// </summary>
     [SugarColumn(ColumnDescription = "文件大小KB", Length = 16)]
     [MaxLength(16)]
-    public string SizeKb { get; set; }
+    public string? SizeKb { get; set; }
 
     /// <summary>
     /// 文件大小信息-计算后的
     /// </summary>
     [SugarColumn(ColumnDescription = "文件大小信息", Length = 64)]
     [MaxLength(64)]
-    public string SizeInfo { get; set; }
+    public string? SizeInfo { get; set; }
 
     /// <summary>
     /// 外链地址-OSS上传后生成外链地址方便前端预览
     /// </summary>
     [SugarColumn(ColumnDescription = "外链地址", Length = 128)]
     [MaxLength(128)]
-    public string Url { get; set; }
+    public string? Url { get; set; }
 }

Admin.NET/Admin.NET.Core/Entity/SysJobCluster.cs

@@ -10,7 +10,7 @@ public class SysJobCluster : BaseId
     /// 作业集群Id
     /// </summary>
     [SugarColumn(ColumnDescription = "作业集群Id", Length = 64)]
-    [MaxLength(64)]
+    [Required, MaxLength(64)]
     public virtual string ClusterId { get; set; }
 
     /// <summary>
@@ -18,7 +18,7 @@ public class SysJobCluster : BaseId
     /// </summary>
     [SugarColumn(ColumnDescription = "描述信息", Length = 128)]
     [MaxLength(128)]
-    public string Description { get; set; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// 状态

Admin.NET/Admin.NET.Core/Entity/SysJobDetail.cs

@@ -10,7 +10,7 @@ public class SysJobDetail : BaseId
     /// 作业Id
     /// </summary>
     [SugarColumn(ColumnDescription = "作业Id", Length = 64)]
-    [MaxLength(64)]
+    [Required, MaxLength(64)]
     public virtual string JobId { get; set; }
 
     /// <summary>
@@ -18,28 +18,28 @@ public class SysJobDetail : BaseId
     /// </summary>
     [SugarColumn(ColumnDescription = "组名称", Length = 128)]
     [MaxLength(128)]
-    public string GroupName { get; set; } = "default";
+    public string? GroupName { get; set; } = "default";
 
     /// <summary>
     /// 作业类型FullName
     /// </summary>
     [SugarColumn(ColumnDescription = "作业类型", Length = 128)]
     [MaxLength(128)]
-    public string JobType { get; set; }
+    public string? JobType { get; set; }
 
     /// <summary>
     /// 程序集Name
     /// </summary>
     [SugarColumn(ColumnDescription = "程序集", Length = 128)]
     [MaxLength(128)]
-    public string AssemblyName { get; set; }
+    public string? AssemblyName { get; set; }
 
     /// <summary>
     /// 描述信息
     /// </summary>
     [SugarColumn(ColumnDescription = "描述信息", Length = 128)]
     [MaxLength(128)]
-    public string Description { get; set; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// 是否并行执行
@@ -50,14 +50,14 @@ public class SysJobDetail : BaseId
     /// <summary>
     /// 是否扫描特性触发器
     /// </summary>
-    [SugarColumn(ColumnDescription = "是否扫描特性触发器")]
+    [SugarColumn(ColumnDescription = "是否扫描特性触发器", ColumnName = "annotation")]
     public bool IncludeAnnotations { get; set; } = false;
 
     /// <summary>
     /// 额外数据
     /// </summary>
     [SugarColumn(ColumnDescription = "额外数据", ColumnDataType = "longtext,text,clob")]
-    public string Properties { get; set; } = "{}";
+    public string? Properties { get; set; } = "{}";
 
     /// <summary>
     /// 更新时间
@@ -69,5 +69,5 @@ public class SysJobDetail : BaseId
     /// 脚本代码
     /// </summary>
     [SugarColumn(ColumnDescription = "脚本代码", ColumnDataType = "longtext,text,clob")]
-    public string ScriptCode { get; set; }
+    public string? ScriptCode { get; set; }
 }

Admin.NET/Admin.NET.Core/Entity/SysJobTrigger.cs

@@ -10,14 +10,14 @@ public class SysJobTrigger : BaseId
     /// 触发器Id
     /// </summary>
     [SugarColumn(ColumnDescription = "触发器Id", Length = 64)]
-    [MaxLength(64)]
+    [Required, MaxLength(64)]
     public virtual string TriggerId { get; set; }
 
     /// <summary>
     /// 作业Id
     /// </summary>
     [SugarColumn(ColumnDescription = "作业Id", Length = 64)]
-    [MaxLength(64)]
+    [Required, MaxLength(64)]
     public virtual string JobId { get; set; }
 
     /// <summary>
@@ -25,28 +25,28 @@ public class SysJobTrigger : BaseId
     /// </summary>
     [SugarColumn(ColumnDescription = "触发器类型", Length = 128)]
     [MaxLength(128)]
-    public string TriggerType { get; set; }
+    public string? TriggerType { get; set; }
 
     /// <summary>
     /// 程序集Name
     /// </summary>
     [SugarColumn(ColumnDescription = "程序集", Length = 128)]
     [MaxLength(128)]
-    public string AssemblyName { get; set; }
+    public string? AssemblyName { get; set; }
 
     /// <summary>
     /// 参数
     /// </summary>
     [SugarColumn(ColumnDescription = "参数", Length = 128)]
     [MaxLength(128)]
-    public string Args { get; set; }
+    public string? Args { get; set; }
 
     /// <summary>
     /// 描述信息
     /// </summary>
     [SugarColumn(ColumnDescription = "描述信息", Length = 128)]
     [MaxLength(128)]
-    public string Description { get; set; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// 状态

Admin.NET/Admin.NET.Core/Entity/SysLogAudit.cs

@@ -10,27 +10,27 @@ public class SysLogAudit : EntityBase
     /// 表名
     /// </summary>
     [SugarColumn(ColumnDescription = "表名", Length = 64)]
-    [MaxLength(64)]
-    public string TableName { get; set; }
+    [Required, MaxLength(64)]
+    public virtual string TableName { get; set; }
 
     /// <summary>
     /// 列名
     /// </summary>
     [SugarColumn(ColumnDescription = "列名", Length = 64)]
-    [MaxLength(64)]
-    public string ColumnName { get; set; }
+    [Required, MaxLength(64)]
+    public virtual string ColumnName { get; set; }
 
     /// <summary>
     /// 新值
     /// </summary>
     [SugarColumn(ColumnDescription = "新值", ColumnDataType = "longtext,text,clob")]
-    public string NewValue { get; set; }
+    public string? NewValue { get; set; }
 
     /// <summary>
     /// 旧值
     /// </summary>
     [SugarColumn(ColumnDescription = "旧值", ColumnDataType = "longtext,text,clob")]
-    public string OldValue { get; set; }
+    public string? OldValue { get; set; }
 
     /// <summary>
     /// 操作方式（新增、更新、删除）
@@ -49,12 +49,12 @@ public class SysLogAudit : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "账号", Length = 32)]
     [MaxLength(32)]
-    public string Account { get; set; }
+    public string? Account { get; set; }
 
     /// <summary>
     /// 真实姓名
     /// </summary>
     [SugarColumn(ColumnDescription = "真实姓名", Length = 32)]
     [MaxLength(32)]
-    public string RealName { get; set; }
+    public string? RealName { get; set; }
 }

Admin.NET/Admin.NET.Core/Entity/SysLogDiff.cs

@@ -10,37 +10,37 @@ public class SysLogDiff : EntityBase
     /// 操作前记录
     /// </summary>
     [SugarColumn(ColumnDescription = "操作前记录", ColumnDataType = "longtext,text,clob")]
-    public string BeforeData { get; set; }
+    public string? BeforeData { get; set; }
 
     /// <summary>
     /// 操作后记录
     /// </summary>
     [SugarColumn(ColumnDescription = "操作后记录", ColumnDataType = "longtext,text,clob")]
-    public string AfterData { get; set; }
+    public string? AfterData { get; set; }
 
     /// <summary>
     /// Sql
     /// </summary>
     [SugarColumn(ColumnDescription = "Sql", ColumnDataType = "longtext,text,clob")]
-    public string Sql { get; set; }
+    public string? Sql { get; set; }
 
     /// <summary>
     /// 参数  手动传入的参数
     /// </summary>
     [SugarColumn(ColumnDescription = "参数", ColumnDataType = "longtext,text,clob")]
-    public string Parameters { get; set; }
+    public string? Parameters { get; set; }
 
     /// <summary>
     /// 业务对象
     /// </summary>
     [SugarColumn(ColumnDescription = "业务对象", ColumnDataType = "longtext,text,clob")]
-    public string BusinessData { get; set; }
+    public string? BusinessData { get; set; }
 
     /// <summary>
     /// 差异操作
     /// </summary>
     [SugarColumn(ColumnDescription = "差异操作", ColumnDataType = "longtext,text,clob")]
-    public string DiffType { get; set; }
+    public string? DiffType { get; set; }
 
     /// <summary>
     /// 耗时

Admin.NET/Admin.NET.Core/Entity/SysLogEx.cs

@@ -11,38 +11,38 @@ public class SysLogEx : EntityTenant
     /// </summary>
     [SugarColumn(ColumnDescription = "记录器类别名称", Length = 256)]
     [MaxLength(256)]
-    public string LogName { get; set; }
+    public string? LogName { get; set; }
 
     /// <summary>
     /// 日志级别
     /// </summary>
     [SugarColumn(ColumnDescription = "日志级别", Length = 16)]
     [MaxLength(16)]
-    public string LogLevel { get; set; }
+    public string? LogLevel { get; set; }
 
     /// <summary>
     /// 事件Id
     /// </summary>
     [SugarColumn(ColumnDescription = "事件Id", ColumnDataType = "longtext,text,clob")]
-    public string EventId { get; set; }
+    public string? EventId { get; set; }
 
     /// <summary>
     /// 日志消息
     /// </summary>
     [SugarColumn(ColumnDescription = "日志消息", ColumnDataType = "longtext,text,clob")]
-    public string Message { get; set; }
+    public string? Message { get; set; }
 
     /// <summary>
     /// 异常对象
     /// </summary>
     [SugarColumn(ColumnDescription = "异常对象", ColumnDataType = "longtext,text,clob")]
-    public string Exception { get; set; }
+    public string? Exception { get; set; }
 
     /// <summary>
     /// 当前状态值
     /// </summary>
     [SugarColumn(ColumnDescription = "当前状态值", ColumnDataType = "longtext,text,clob")]
-    public string State { get; set; }
+    public string? State { get; set; }
 
     /// <summary>
     /// 日志记录时间
@@ -61,5 +61,5 @@ public class SysLogEx : EntityTenant
     /// </summary>
     [SugarColumn(ColumnDescription = "请求跟踪Id", Length = 128)]
     [MaxLength(128)]
-    public string TraceId { get; set; }
+    public string? TraceId { get; set; }
 }

Admin.NET/Admin.NET.Core/Entity/SysLogOp.cs

@@ -11,38 +11,38 @@ public class SysLogOp : EntityTenant
     /// </summary>
     [SugarColumn(ColumnDescription = "记录器类别名称", Length = 256)]
     [MaxLength(256)]
-    public string LogName { get; set; }
+    public string? LogName { get; set; }
 
     /// <summary>
     /// 日志级别
     /// </summary>
     [SugarColumn(ColumnDescription = "日志级别", Length = 16)]
     [MaxLength(16)]
-    public string LogLevel { get; set; }
+    public string? LogLevel { get; set; }
 
     /// <summary>
     /// 事件Id
     /// </summary>
     [SugarColumn(ColumnDescription = "事件Id", ColumnDataType = "longtext,text,clob")]
-    public string EventId { get; set; }
+    public string? EventId { get; set; }
 
     /// <summary>
     /// 日志消息
     /// </summary>
     [SugarColumn(ColumnDescription = "日志消息", ColumnDataType = "longtext,text,clob")]
-    public string Message { get; set; }
+    public string? Message { get; set; }
 
     /// <summary>
     /// 异常对象
     /// </summary>
     [SugarColumn(ColumnDescription = "异常对象", ColumnDataType = "longtext,text,clob")]
-    public string Exception { get; set; }
+    public string? Exception { get; set; }
 
     /// <summary>
     /// 当前状态值
     /// </summary>
     [SugarColumn(ColumnDescription = "当前状态值", ColumnDataType = "longtext,text,clob")]
-    public string State { get; set; }
+    public string? State { get; set; }
 
     /// <summary>
     /// 日志记录时间
@@ -61,5 +61,5 @@ public class SysLogOp : EntityTenant
     /// </summary>
     [SugarColumn(ColumnDescription = "请求跟踪Id", Length = 128)]
     [MaxLength(128)]
-    public string TraceId { get; set; }
+    public string? TraceId { get; set; }
 }

Admin.NET/Admin.NET.Core/Entity/SysLogVis.cs

@@ -16,35 +16,35 @@ public class SysLogVis : EntityTenant
     /// 具体消息
     /// </summary>
     [SugarColumn(ColumnDescription = "具体消息", ColumnDataType = "longtext,text,clob")]
-    public string Message { get; set; }
+    public string? Message { get; set; }
 
     /// <summary>
     /// IP地址
     /// </summary>
     [SugarColumn(ColumnDescription = "IP地址", Length = 16)]
     [MaxLength(16)]
-    public string Ip { get; set; }
+    public string? Ip { get; set; }
 
     /// <summary>
     /// 地址
     /// </summary>
     [SugarColumn(ColumnDescription = "地址", Length = 128)]
     [MaxLength(128)]
-    public string Location { get; set; }
+    public string? Location { get; set; }
 
     /// <summary>
     /// 浏览器
     /// </summary>
     [SugarColumn(ColumnDescription = "浏览器", Length = 128)]
     [MaxLength(128)]
-    public string Browser { get; set; }
+    public string? Browser { get; set; }
 
     /// <summary>
     /// 操作系统
     /// </summary>
     [SugarColumn(ColumnDescription = "操作系统", Length = 128)]
     [MaxLength(128)]
-    public string Os { get; set; }
+    public string? Os { get; set; }
 
     /// <summary>
     /// 访问类型
@@ -57,12 +57,12 @@ public class SysLogVis : EntityTenant
     /// </summary>
     [SugarColumn(ColumnDescription = "账号", Length = 32)]
     [MaxLength(32)]
-    public string Account { get; set; }
+    public string? Account { get; set; }
 
     /// <summary>
     /// 真实姓名
     /// </summary>
     [SugarColumn(ColumnDescription = "真实姓名", Length = 32)]
     [MaxLength(32)]
-    public string RealName { get; set; }
+    public string? RealName { get; set; }
 }

Admin.NET/Admin.NET.Core/Entity/SysMenu.cs

@@ -23,35 +23,35 @@ public class SysMenu : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "名称", Length = 64)]
     [MaxLength(64)]
-    public string Name { get; set; }
+    public string? Name { get; set; }
 
     /// <summary>
     /// 路由地址
     /// </summary>
     [SugarColumn(ColumnDescription = "路由地址", Length = 128)]
     [MaxLength(128)]
-    public string Path { get; set; }
+    public string? Path { get; set; }
 
     /// <summary>
     /// 组件路径
     /// </summary>
     [SugarColumn(ColumnDescription = "组件路径", Length = 128)]
     [MaxLength(128)]
-    public string Component { get; set; }
+    public string? Component { get; set; }
 
     /// <summary>
     /// 重定向
     /// </summary>
     [SugarColumn(ColumnDescription = "重定向", Length = 128)]
     [MaxLength(128)]
-    public string Redirect { get; set; }
+    public string? Redirect { get; set; }
 
     /// <summary>
     /// 权限标识
     /// </summary>
     [SugarColumn(ColumnDescription = "权限标识", Length = 128)]
     [MaxLength(128)]
-    public string Permission { get; set; }
+    public string? Permission { get; set; }
 
     /// <summary>
     /// 标题
@@ -65,7 +65,7 @@ public class SysMenu : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "图标", Length = 128)]
     [MaxLength(128)]
-    public string Icon { get; set; }
+    public string? Icon { get; set; }
 
     /// <summary>
     /// 是否内嵌
@@ -78,7 +78,7 @@ public class SysMenu : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "外链链接", Length = 256)]
     [MaxLength(256)]
-    public string OutLink { get; set; }
+    public string? OutLink { get; set; }
 
     /// <summary>
     /// 是否隐藏
@@ -115,7 +115,7 @@ public class SysMenu : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "备注", Length = 256)]
     [MaxLength(256)]
-    public string Remark { get; set; }
+    public string? Remark { get; set; }
 
     /// <summary>
     /// 菜单子项

Admin.NET/Admin.NET.Core/Entity/SysNotice.cs

@@ -37,7 +37,7 @@ public class SysNotice : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "发布人姓名", Length = 32)]
     [MaxLength(32)]
-    public string PublicUserName { get; set; }
+    public string? PublicUserName { get; set; }
 
     /// <summary>
     /// 发布机构Id
@@ -50,19 +50,19 @@ public class SysNotice : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "发布机构名称", Length = 64)]
     [MaxLength(64)]
-    public string PublicOrgName { get; set; }
+    public string? PublicOrgName { get; set; }
 
     /// <summary>
     /// 发布时间
     /// </summary>
     [SugarColumn(ColumnDescription = "发布时间")]
-    public DateTime PublicTime { get; set; }
+    public DateTime? PublicTime { get; set; }
 
     /// <summary>
     /// 撤回时间
     /// </summary>
     [SugarColumn(ColumnDescription = "撤回时间")]
-    public DateTime CancelTime { get; set; }
+    public DateTime? CancelTime { get; set; }
 
     /// <summary>
     /// 状态（0草稿 1发布 2撤回 3删除）

Admin.NET/Admin.NET.Core/Entity/SysNoticeUser.cs

@@ -29,7 +29,7 @@ public class SysNoticeUser
     /// 阅读时间
     /// </summary>
     [SugarColumn(ColumnDescription = "阅读时间")]
-    public DateTime ReadTime { get; set; }
+    public DateTime? ReadTime { get; set; }
 
     /// <summary>
     /// 状态（0未读 1已读）

Admin.NET/Admin.NET.Core/Entity/SysOnlineUser.cs

@@ -10,7 +10,7 @@ public class SysOnlineUser : EntityTenantId
     /// 连接Id
     /// </summary>
     [SugarColumn(ColumnDescription = "连接Id")]
-    public string ConnectionId { get; set; }
+    public string? ConnectionId { get; set; }
 
     /// <summary>
     /// 用户Id
@@ -30,32 +30,32 @@ public class SysOnlineUser : EntityTenantId
     /// </summary>
     [SugarColumn(ColumnDescription = "真实姓名", Length = 32)]
     [MaxLength(32)]
-    public string RealName { get; set; }
+    public string? RealName { get; set; }
 
     /// <summary>
     /// 连接时间
     /// </summary>
     [SugarColumn(ColumnDescription = "连接时间")]
-    public DateTime Time { get; set; }
+    public DateTime? Time { get; set; }
 
     /// <summary>
     /// 连接IP
     /// </summary>
     [SugarColumn(ColumnDescription = "连接IP", Length = 16)]
     [MaxLength(16)]
-    public string Ip { get; set; }
+    public string? Ip { get; set; }
 
     /// <summary>
     /// 浏览器
     /// </summary>
     [SugarColumn(ColumnDescription = "浏览器", Length = 128)]
     [MaxLength(128)]
-    public string Browser { get; set; }
+    public string? Browser { get; set; }
 
     /// <summary>
     /// 操作系统
     /// </summary>
     [SugarColumn(ColumnDescription = "操作系统", Length = 128)]
     [MaxLength(128)]
-    public string Os { get; set; }
+    public string? Os { get; set; }
 }

Admin.NET/Admin.NET.Core/Entity/SysOrg.cs

@@ -24,7 +24,7 @@ public class SysOrg : EntityTenant
     /// </summary>
     [SugarColumn(ColumnDescription = "编码", Length = 64)]
     [MaxLength(64)]
-    public string Code { get; set; }
+    public string? Code { get; set; }
 
     /// <summary>
     /// 排序
@@ -37,7 +37,7 @@ public class SysOrg : EntityTenant
     /// </summary>
     [SugarColumn(ColumnDescription = "备注", Length = 128)]
     [MaxLength(128)]
-    public string Remark { get; set; }
+    public string? Remark { get; set; }
 
     /// <summary>
     /// 状态

Admin.NET/Admin.NET.Core/Entity/SysPos.cs

@@ -18,7 +18,7 @@ public class SysPos : EntityTenant
     /// </summary>
     [SugarColumn(ColumnDescription = "编码", Length = 64)]
     [MaxLength(64)]
-    public string Code { get; set; }
+    public string? Code { get; set; }
 
     /// <summary>
     /// 排序
@@ -31,7 +31,7 @@ public class SysPos : EntityTenant
     /// </summary>
     [SugarColumn(ColumnDescription = "备注", Length = 128)]
     [MaxLength(128)]
-    public string Remark { get; set; }
+    public string? Remark { get; set; }
 
     /// <summary>
     /// 状态

Admin.NET/Admin.NET.Core/Entity/SysRegion.cs

@@ -24,35 +24,35 @@ public class SysRegion : EntityBaseId
     /// </summary>
     [SugarColumn(ColumnDescription = "简称", Length = 32)]
     [MaxLength(32)]
-    public string ShortName { get; set; }
+    public string? ShortName { get; set; }
 
     /// <summary>
     /// 组合名
     /// </summary>
     [SugarColumn(ColumnDescription = "组合名", Length = 64)]
     [MaxLength(64)]
-    public string MergerName { get; set; }
+    public string? MergerName { get; set; }
 
     /// <summary>
     /// 行政代码
     /// </summary>
     [SugarColumn(ColumnDescription = "行政代码", Length = 32)]
     [MaxLength(32)]
-    public string Code { get; set; }
+    public string? Code { get; set; }
 
     /// <summary>
     /// 邮政编码
     /// </summary>
     [SugarColumn(ColumnDescription = "邮政编码", Length = 6)]
     [MaxLength(6)]
-    public string ZipCode { get; set; }
+    public string? ZipCode { get; set; }
 
     /// <summary>
     /// 区号
     /// </summary>
     [SugarColumn(ColumnDescription = "区号", Length = 6)]
     [MaxLength(6)]
-    public string CityCode { get; set; }
+    public string? CityCode { get; set; }
 
     /// <summary>
     /// 层级
@@ -65,7 +65,7 @@ public class SysRegion : EntityBaseId
     /// </summary>
     [SugarColumn(ColumnDescription = "拼音", Length = 128)]
     [MaxLength(128)]
-    public string PinYin { get; set; }
+    public string? PinYin { get; set; }
 
     /// <summary>
     /// 经度
@@ -90,7 +90,7 @@ public class SysRegion : EntityBaseId
     /// </summary>
     [SugarColumn(ColumnDescription = "备注", Length = 128)]
     [MaxLength(128)]
-    public string Remark { get; set; }
+    public string? Remark { get; set; }
 
     /// <summary>
     /// 机构子项

Admin.NET/Admin.NET.Core/Entity/SysRole.cs

@@ -18,7 +18,7 @@ public class SysRole : EntityTenant
     /// </summary>
     [SugarColumn(ColumnDescription = "编码", Length = 64)]
     [MaxLength(64)]
-    public string Code { get; set; }
+    public string? Code { get; set; }
 
     /// <summary>
     /// 排序
@@ -37,7 +37,7 @@ public class SysRole : EntityTenant
     /// </summary>
     [SugarColumn(ColumnDescription = "备注", Length = 128)]
     [MaxLength(128)]
-    public string Remark { get; set; }
+    public string? Remark { get; set; }
 
     /// <summary>
     /// 状态

Admin.NET/Admin.NET.Core/Entity/SysTenant.cs

@@ -23,7 +23,7 @@ public class SysTenant : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "主机", Length = 128)]
     [MaxLength(128)]
-    public string Host { get; set; }
+    public string? Host { get; set; }
 
     /// <summary>
     /// 租户类型
@@ -42,14 +42,14 @@ public class SysTenant : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "数据库连接", Length = 256)]
     [MaxLength(256)]
-    public string Connection { get; set; }
+    public string? Connection { get; set; }
 
     /// <summary>
     /// 数据库标识
     /// </summary>
     [SugarColumn(ColumnDescription = "数据库标识", Length = 64)]
     [MaxLength(64)]
-    public string ConfigId { get; set; }
+    public string? ConfigId { get; set; }
 
     /// <summary>
     /// 排序
@@ -62,7 +62,7 @@ public class SysTenant : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "备注", Length = 128)]
     [MaxLength(128)]
-    public string Remark { get; set; }
+    public string? Remark { get; set; }
 
     /// <summary>
     /// 状态

Admin.NET/Admin.NET.Core/Entity/SysUser.cs

@@ -17,7 +17,7 @@ public class SysUser : EntityTenant
     /// 密码（MD5加密）
     /// </summary>
     [SugarColumn(ColumnDescription = "密码", Length = 64)]
-    [MaxLength(64)]
+    [Required, MaxLength(64)]
     [System.Text.Json.Serialization.JsonIgnore]
     [JsonIgnore]
     public virtual string Password { get; set; }
@@ -34,14 +34,14 @@ public class SysUser : EntityTenant
     /// </summary>
     [SugarColumn(ColumnDescription = "昵称", Length = 32)]
     [MaxLength(32)]
-    public string NickName { get; set; }
+    public string? NickName { get; set; }
 
     /// <summary>
     /// 头像
     /// </summary>
     [SugarColumn(ColumnDescription = "头像", Length = 512)]
     [MaxLength(512)]
-    public string Avatar { get; set; }
+    public string? Avatar { get; set; }
 
     /// <summary>
     /// 性别-男_1、女_2
@@ -66,41 +66,41 @@ public class SysUser : EntityTenant
     /// </summary>
     [SugarColumn(ColumnDescription = "民族", Length = 32)]
     [MaxLength(32)]
-    public string Nation { get; set; }
+    public string? Nation { get; set; }
 
     /// <summary>
     /// 手机号码
     /// </summary>
     [SugarColumn(ColumnDescription = "手机号码", Length = 16)]
     [MaxLength(16)]
-    public virtual string Phone { get; set; }
+    public string? Phone { get; set; }
 
     /// <summary>
     /// 证件类型
     /// </summary>
     [SugarColumn(ColumnDescription = "证件类型")]
-    public virtual CardTypeEnum CardType { get; set; }
+    public CardTypeEnum CardType { get; set; }
 
     /// <summary>
     /// 身份证号
     /// </summary>
     [SugarColumn(ColumnDescription = "身份证号", Length = 32)]
     [MaxLength(32)]
-    public virtual string IdCardNum { get; set; }
+    public string? IdCardNum { get; set; }
 
     /// <summary>
     /// 邮箱
     /// </summary>
     [SugarColumn(ColumnDescription = "邮箱", Length = 64)]
     [MaxLength(64)]
-    public string Email { get; set; }
+    public string? Email { get; set; }
 
     /// <summary>
     /// 地址
     /// </summary>
     [SugarColumn(ColumnDescription = "地址", Length = 256)]
     [MaxLength(256)]
-    public string Address { get; set; }
+    public string? Address { get; set; }
 
     /// <summary>
     /// 文化程度
@@ -113,49 +113,49 @@ public class SysUser : EntityTenant
     /// </summary>
     [SugarColumn(ColumnDescription = "政治面貌", Length = 16)]
     [MaxLength(16)]
-    public string PoliticalOutlook { get; set; }
+    public string? PoliticalOutlook { get; set; }
 
     /// <summary>
     /// 毕业院校
     /// </summary>COLLEGE
     [SugarColumn(ColumnDescription = "毕业院校", Length = 128)]
     [MaxLength(128)]
-    public string College { get; set; }
+    public string? College { get; set; }
 
     /// <summary>
     /// 办公电话
     /// </summary>
     [SugarColumn(ColumnDescription = "办公电话", Length = 16)]
     [MaxLength(16)]
-    public string OfficePhone { get; set; }
+    public string? OfficePhone { get; set; }
 
     /// <summary>
     /// 紧急联系人
     /// </summary>
     [SugarColumn(ColumnDescription = "紧急联系人", Length = 32)]
     [MaxLength(32)]
-    public string EmergencyContact { get; set; }
+    public string? EmergencyContact { get; set; }
 
     /// <summary>
     /// 紧急联系人电话
     /// </summary>
     [SugarColumn(ColumnDescription = "紧急联系人电话", Length = 16)]
     [MaxLength(16)]
-    public string EmergencyPhone { get; set; }
+    public string? EmergencyPhone { get; set; }
 
     /// <summary>
     /// 紧急联系人地址
     /// </summary>
     [SugarColumn(ColumnDescription = "紧急联系人地址", Length = 256)]
     [MaxLength(256)]
-    public string EmergencyAddress { get; set; }
+    public string? EmergencyAddress { get; set; }
 
     /// <summary>
     /// 个人简介
     /// </summary>
     [SugarColumn(ColumnDescription = "个人简介", Length = 512)]
     [MaxLength(512)]
-    public string Introduction { get; set; }
+    public string? Introduction { get; set; }
 
     /// <summary>
     /// 排序
@@ -174,7 +174,7 @@ public class SysUser : EntityTenant
     /// </summary>
     [SugarColumn(ColumnDescription = "备注", Length = 128)]
     [MaxLength(128)]
-    public string Remark { get; set; }
+    public string? Remark { get; set; }
 
     /// <summary>
     /// 账号类型
@@ -213,14 +213,14 @@ public class SysUser : EntityTenant
     /// </summary>
     [SugarColumn(ColumnDescription = "工号", Length = 32)]
     [MaxLength(32)]
-    public string JobNum { get; set; }
+    public string? JobNum { get; set; }
 
     /// <summary>
     /// 职级
     /// </summary>
     [SugarColumn(ColumnDescription = "职级", Length = 32)]
     [MaxLength(32)]
-    public string PosLevel { get; set; }
+    public string? PosLevel { get; set; }
 
     /// <summary>
     /// 入职日期
@@ -233,14 +233,14 @@ public class SysUser : EntityTenant
     /// </summary>
     [SugarColumn(ColumnDescription = "最新登录Ip", Length = 16)]
     [MaxLength(16)]
-    public string LastLoginIp { get; set; }
+    public string? LastLoginIp { get; set; }
 
     /// <summary>
     /// 最新登录地点
     /// </summary>
     [SugarColumn(ColumnDescription = "最新登录地点", Length = 128)]
     [MaxLength(128)]
-    public string LastLoginAddress { get; set; }
+    public string? LastLoginAddress { get; set; }
 
     /// <summary>
     /// 最新登录时间
@@ -253,12 +253,12 @@ public class SysUser : EntityTenant
     /// </summary>
     [SugarColumn(ColumnDescription = "最新登录设备", Length = 128)]
     [MaxLength(128)]
-    public string LastLoginDevice { get; set; }
+    public string? LastLoginDevice { get; set; }
 
     /// <summary>
     /// 电子签名
     /// </summary>
     [SugarColumn(ColumnDescription = "电子签名", Length = 512)]
     [MaxLength(512)]
-    public string Signature { get; set; }
+    public string? Signature { get; set; }
 }

Admin.NET/Admin.NET.Core/Entity/SysUserExtOrg.cs

@@ -43,14 +43,14 @@ public class SysUserExtOrg : EntityBaseId
     /// </summary>
     [SugarColumn(ColumnDescription = "工号", Length = 32)]
     [MaxLength(32)]
-    public string JobNum { get; set; }
+    public string? JobNum { get; set; }
 
     /// <summary>
     /// 职级
     /// </summary>
     [SugarColumn(ColumnDescription = "职级", Length = 32)]
     [MaxLength(32)]
-    public string PosLevel { get; set; }
+    public string? PosLevel { get; set; }
 
     /// <summary>
     /// 入职日期

Admin.NET/Admin.NET.Core/Entity/WeChatPay.cs

@@ -1,58 +1,62 @@
 namespace Admin.NET.Core;
 
 /// <summary>
-/// 微信支付表
+/// 系统微信支付表
 /// </summary>
-[SugarTable("wechat_pay", "微信支付表")]
+[SugarTable("sys_wechat_pay", "系统微信支付表")]
 public class WeChatPay : EntityBase
 {
     /// <summary>
     /// 微信商户号
     /// </summary>
     [SugarColumn(ColumnDescription = "微信商户号")]
-    public string MerchantId { get; set; }
+    [Required]
+    public virtual string MerchantId { get; set; }
 
     /// <summary>
     /// 服务商AppId
     /// </summary>
     [SugarColumn(ColumnDescription = "服务商AppId")]
-    public string AppId { get; set; }
+    [Required]
+    public virtual string AppId { get; set; }
 
     /// <summary>
     /// 商户订单号
     /// </summary>
     [SugarColumn(ColumnDescription = "商户订单号")]
-    public string OutTradeNumber { get; set; }
+    [Required]
+    public virtual string OutTradeNumber { get; set; }
 
     /// <summary>
     /// 支付订单号
     /// </summary>
     [SugarColumn(ColumnDescription = "支付订单号")]
-    public string TransactionId { get; set; }
+    [Required]
+    public virtual string TransactionId { get; set; }
 
     /// <summary>
     /// 交易类型
     /// </summary>
     [SugarColumn(ColumnDescription = "交易类型")]
-    public string TradeType { get; set; }
+    public string? TradeType { get; set; }
 
     /// <summary>
     /// 交易状态
     /// </summary>
     [SugarColumn(ColumnDescription = "交易状态")]
-    public string TradeState { get; set; }
+    public string? TradeState { get; set; }
 
     /// <summary>
     /// 交易状态描述
     /// </summary>
     [SugarColumn(ColumnDescription = "交易状态描述")]
-    public string TradeStateDescription { get; set; }
+    public string? TradeStateDescription { get; set; }
 
     /// <summary>
     /// 付款银行类型
     /// </summary>
     [SugarColumn(ColumnDescription = "付款银行类型")]
-    public string BankType { get; set; }
+    public string? BankType { get; set; }
 
     /// <summary>
     /// 订单总金额
@@ -82,49 +86,49 @@ public class WeChatPay : EntityBase
     /// 商品描述
     /// </summary>
     [SugarColumn(ColumnDescription = "商品描述")]
-    public string Description { get; set; }
+    public string? Description { get; set; }
 
     /// <summary>
     /// 场景信息
     /// </summary>
     [SugarColumn(ColumnDescription = "场景信息")]
-    public string Scene { get; set; }
+    public string? Scene { get; set; }
 
     /// <summary>
     /// 附加数据
     /// </summary>
     [SugarColumn(ColumnDescription = "附加数据")]
-    public string Attachment { get; set; }
+    public string? Attachment { get; set; }
 
     /// <summary>
     /// 优惠标记
     /// </summary>
     [SugarColumn(ColumnDescription = "优惠标记")]
-    public string GoodsTag { get; set; }
+    public string? GoodsTag { get; set; }
 
     /// <summary>
     /// 结算信息
     /// </summary>
     [SugarColumn(ColumnDescription = "结算信息")]
-    public string Settlement { get; set; }
+    public string? Settlement { get; set; }
 
     /// <summary>
     /// 回调通知地址
     /// </summary>
     [SugarColumn(ColumnDescription = "回调通知地址")]
-    public string NotifyUrl { get; set; }
+    public string? NotifyUrl { get; set; }
 
     /// <summary>
     /// 备注
     /// </summary>
     [SugarColumn(ColumnDescription = "备注")]
-    public string Remark { get; set; }
+    public string? Remark { get; set; }
 
     /// <summary>
     /// 微信OpenId标识
     /// </summary>
     [SugarColumn(ColumnDescription = "微信OpenId标识")]
-    public string OpenId { get; set; }
+    public string? OpenId { get; set; }
 
     /// <summary>
     /// 关联微信用户
@@ -137,17 +141,17 @@ public class WeChatPay : EntityBase
     /// 子商户号
     /// </summary>
     [SugarColumn(ColumnDescription = "子商户号")]
-    public string SubMerchantId { get; set; }
+    public string? SubMerchantId { get; set; }
 
     /// <summary>
     /// 子商户AppId
     /// </summary>
     [SugarColumn(ColumnDescription = "回调通知地址")]
-    public string SubAppId { get; set; }
+    public string? SubAppId { get; set; }
 
     /// <summary>
     /// 子商户唯一标识
     /// </summary>
     [SugarColumn(ColumnDescription = "子商户唯一标识")]
-    public string SubOpenId { get; set; }
+    public string? SubOpenId { get; set; }
 }

Admin.NET/Admin.NET.Core/Entity/WeChatUser.cs

@@ -1,9 +1,9 @@
 namespace Admin.NET.Core;
 
 /// <summary>
-/// 微信用户表
+/// 系统微信用户表
 /// </summary>
-[SugarTable("wechat_user", "微信用户表")]
+[SugarTable("sys_wechat_user", "系统微信用户表")]
 public class WeChatUser : EntityBase
 {
     /// <summary>
@@ -37,35 +37,35 @@ public class WeChatUser : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "缓存key", Length = 256)]
     [MaxLength(256)]
-    public string SessionKey { get; set; }
+    public string? SessionKey { get; set; }
 
     /// <summary>
     /// UnionId
     /// </summary>
     [SugarColumn(ColumnDescription = "UnionId", Length = 64)]
     [MaxLength(64)]
-    public string UnionId { get; set; }
+    public string? UnionId { get; set; }
 
     /// <summary>
     /// 昵称
     /// </summary>
     [SugarColumn(ColumnDescription = "昵称", Length = 64)]
     [MaxLength(64)]
-    public string NickName { get; set; }
+    public string? NickName { get; set; }
 
     /// <summary>
     /// 头像
     /// </summary>
     [SugarColumn(ColumnDescription = "头像", Length = 256)]
     [MaxLength(256)]
-    public string Avatar { get; set; }
+    public string? Avatar { get; set; }
 
     /// <summary>
     /// 手机号码
     /// </summary>
     [SugarColumn(ColumnDescription = "手机号码", Length = 16)]
     [MaxLength(16)]
-    public string Mobile { get; set; }
+    public string? Mobile { get; set; }
 
     /// <summary>
     /// 性别
@@ -78,40 +78,40 @@ public class WeChatUser : EntityBase
     /// </summary>
     [SugarColumn(ColumnDescription = "语言", Length = 64)]
     [MaxLength(64)]
-    public string Language { get; set; }
+    public string? Language { get; set; }
 
     /// <summary>
     /// 城市
     /// </summary>
     [SugarColumn(ColumnDescription = "城市", Length = 64)]
     [MaxLength(64)]
-    public string City { get; set; }
+    public string? City { get; set; }
 
     /// <summary>
     /// 省
     /// </summary>
     [SugarColumn(ColumnDescription = "省", Length = 64)]
     [MaxLength(64)]
-    public string Province { get; set; }
+    public string? Province { get; set; }
 
     /// <summary>
     /// 国家
     /// </summary>
     [SugarColumn(ColumnDescription = "国家", Length = 64)]
     [MaxLength(64)]
-    public string Country { get; set; }
+    public string? Country { get; set; }
 
     /// <summary>
     /// AccessToken
     /// </summary>
     [SugarColumn(ColumnDescription = "AccessToken", ColumnDataType = "longtext,text,clob")]
-    public string AccessToken { get; set; }
+    public string? AccessToken { get; set; }
 
     /// <summary>
     /// RefreshToken
     /// </summary>
     [SugarColumn(ColumnDescription = "RefreshToken", ColumnDataType = "longtext,text,clob")]
-    public string RefreshToken { get; set; }
+    public string? RefreshToken { get; set; }
 
     /// <summary>
     /// 过期时间

Admin.NET/Admin.NET.Core/Extension/ObjectExtension.cs

@@ -64,7 +64,7 @@ public static partial class ObjectExtension
         DataTable result = new();
         if (list.Count > 0)
         {
-            // result.TableName = list[0].GetType().Name; // 表名赋值
+            // result.TableName = list[0].GetType().Name; // 表名赋值          
             PropertyInfo[] propertys = list[0].GetType().GetProperties();
             foreach (PropertyInfo pi in propertys)
             {

Admin.NET/Admin.NET.Core/SeedData/SysMenuSeedData.cs

@@ -14,142 +14,142 @@ public class SysMenuSeedData : ISqlSugarEntitySeedData<SysMenu>
     {
         return new[]
         {
-            new SysMenu{ Id=252885263002100, Pid=0, Title="数据面板", Path="/dashboard", Name="dashboard", Component="Layout", Redirect="/dashboard/home", Icon="ele-HomeFilled", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=10 },
+            new SysMenu{ Id=252885263002100, Pid=0, Title="工作台", Path="/dashboard", Name="dashboard", Component="Layout", Redirect="/dashboard/home", Icon="ele-HomeFilled", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=0 },
             new SysMenu{ Id=252885263002110, Pid=252885263002100, Title="工作台", Path="/dashboard/home", Name="home", Component="/home/index", IsAffix=true, Icon="ele-HomeFilled", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=252885263002111, Pid=252885263002100, Title="站内信", Path="/dashboard/notice", Name="notice", Component="/home/notice/index", Icon="ele-Bell", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=101 },
 
-            new SysMenu{ Id=252885263005200, Pid=0, Title="系统管理", Path="/system", Name="system", Component="Layout", Redirect="/system/user", Icon="ele-Setting", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-            new SysMenu{ Id=252885263005210, Pid=252885263005200, Title="账号管理", Path="/system/user", Name="sysUser", Component="/system/user/index", Icon="ele-User", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005211, Pid=252885263005210, Title="查询", Permission="sysUser:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005212, Pid=252885263005210, Title="编辑", Permission="sysUser:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005213, Pid=252885263005210, Title="增加", Permission="sysUser:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005214, Pid=252885263005210, Title="删除", Permission="sysUser:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005215, Pid=252885263005210, Title="详情", Permission="sysUser:detail", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005216, Pid=252885263005210, Title="授权角色", Permission="sysUser:grantRole", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005217, Pid=252885263005210, Title="重置密码", Permission="sysUser:resetPwd", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005218, Pid=252885263005210, Title="设置状态", Permission="sysUser:setStatus", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005219, Pid=252885263005210, Title="修改密码", Permission="sysUser:changePwd", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005220, Pid=252885263005210, Title="强制下线", Permission="sysUser:forceOffline", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-            new SysMenu{ Id=252885263005230, Pid=252885263005200, Title="角色管理", Path="/system/role", Name="sysRole", Component="/system/role/index", Icon="ele-Help", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=110 },
-            new SysMenu{ Id=252885263005231, Pid=252885263005230, Title="查询", Permission="sysRole:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005232, Pid=252885263005230, Title="编辑", Permission="sysRole:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005233, Pid=252885263005230, Title="增加", Permission="sysRole:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005234, Pid=252885263005230, Title="删除", Permission="sysRole:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005235, Pid=252885263005230, Title="授权菜单", Permission="sysRole:grantMenu", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005236, Pid=252885263005230, Title="授权数据", Permission="sysRole:grantData", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005237, Pid=252885263005230, Title="设置状态", Permission="sysRole:setStatus", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-            new SysMenu{ Id=252885263005240, Pid=252885263005200, Title="机构管理", Path="/system/org", Name="sysOrg", Component="/system/org/index", Icon="ele-OfficeBuilding", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=130 },
-            new SysMenu{ Id=252885263005241, Pid=252885263005240, Title="查询", Permission="sysOrg:list", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005242, Pid=252885263005240, Title="编辑", Permission="sysOrg:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005243, Pid=252885263005240, Title="增加", Permission="sysOrg:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005244, Pid=252885263005240, Title="删除", Permission="sysOrg:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-            new SysMenu{ Id=252885263005250, Pid=252885263005200, Title="职位管理", Path="/system/pos", Name="sysPos", Component="/system/pos/index",Icon="ele-Mug", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=140 },
-            new SysMenu{ Id=252885263005251, Pid=252885263005250, Title="查询", Permission="sysPos:list", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005252, Pid=252885263005250, Title="编辑", Permission="sysPos:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005253, Pid=252885263005250, Title="增加", Permission="sysPos:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005254, Pid=252885263005250, Title="删除", Permission="sysPos:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-            new SysMenu{ Id=252885263005260, Pid=252885263005200, Title="个人中心", Path="/system/userCenter", Name="sysUserCenter", Component="/system/user/component/userCenter",Icon="ele-Medal", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=150 },
-            new SysMenu{ Id=252885263005261, Pid=252885263005260, Title="修改密码", Permission="sysUser:changePwd", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005262, Pid=252885263005260, Title="更新信息", Permission="sysUser:updateBase", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005263, Pid=252885263005260, Title="电子签名", Permission="sysUser:signature", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-            new SysMenu{ Id=252885263005270, Pid=252885263005200, Title="通知公告", Path="/system/notice", Name="sysNotice", Component="/system/notice/index",Icon="ele-Bell", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=160 },
-            new SysMenu{ Id=252885263005271, Pid=252885263005270, Title="查询", Permission="sysNotice:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005272, Pid=252885263005270, Title="编辑", Permission="sysNotice:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005273, Pid=252885263005270, Title="增加", Permission="sysNotice:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005274, Pid=252885263005270, Title="删除", Permission="sysNotice:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005275, Pid=252885263005270, Title="发布", Permission="sysNotice:public", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005276, Pid=252885263005270, Title="撤回", Permission="sysNotice:cancel", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-               
-            new SysMenu{ Id=252885263005280, Pid=252885263005200, Title="三方账号", Path="/system/weChatUser", Name="weChatUser", Component="/system/weChatUser/index",Icon="ele-ChatDotRound", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=170 },
-            new SysMenu{ Id=252885263005281, Pid=252885263005280, Title="查询", Permission="weChatUser:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005282, Pid=252885263005280, Title="编辑", Permission="weChatUser:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005283, Pid=252885263005280, Title="删除", Permission="weChatUser:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-            new SysMenu{ Id=252885263005300, Pid=0, Title="平台管理", Path="/platform", Name="platform", Component="Layout", Redirect="/platform/tenant", Icon="ele-Menu", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=200 },
-
-            new SysMenu{ Id=252885263005310, Pid=252885263005300, Title="租户管理", Path="/platform/tenant", Name="sysTenant", Component="/system/tenant/index", Icon="ele-School", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005311, Pid=252885263005310, Title="查询", Permission="sysTenant:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005312, Pid=252885263005310, Title="编辑", Permission="sysTenant:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005313, Pid=252885263005310, Title="增加", Permission="sysTenant:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005314, Pid=252885263005310, Title="删除", Permission="sysTenant:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005315, Pid=252885263005310, Title="授权菜单", Permission="sysTenant:grantMenu", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005316, Pid=252885263005310, Title="重置密码", Permission="sysTenant:resetPwd", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005317, Pid=252885263005310, Title="生成库", Permission="sysTenant:createDb", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-            new SysMenu{ Id=252885263005320, Pid=252885263005300, Title="菜单管理", Path="/platform/menu", Name="sysMenu", Component="/system/menu/index", Icon="ele-Menu", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=120 },
-            new SysMenu{ Id=252885263005321, Pid=252885263005320, Title="查询", Permission="sysMenu:list", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005322, Pid=252885263005320, Title="编辑", Permission="sysMenu:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005323, Pid=252885263005320, Title="增加", Permission="sysMenu:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005324, Pid=252885263005320, Title="删除", Permission="sysMenu:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-            new SysMenu{ Id=252885263005330, Pid=252885263005300, Title="参数配置", Path="/platform/config", Name="sysConfig", Component="/system/config/index", Icon="ele-DocumentCopy", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=110 },
-            new SysMenu{ Id=252885263005331, Pid=252885263005330, Title="查询", Permission="sysConfig:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005332, Pid=252885263005330, Title="编辑", Permission="sysConfig:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005333, Pid=252885263005330, Title="增加", Permission="sysConfig:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005334, Pid=252885263005330, Title="删除", Permission="sysConfig:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-            new SysMenu{ Id=252885263005340, Pid=252885263005300, Title="字典管理", Path="/platform/dict", Name="sysDict", Component="/system/dict/index", Icon="ele-Collection", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=120 },
-            new SysMenu{ Id=252885263005341, Pid=252885263005340, Title="查询", Permission="sysDictType:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005342, Pid=252885263005340, Title="编辑", Permission="sysDictType:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005343, Pid=252885263005340, Title="增加", Permission="sysDictType:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005344, Pid=252885263005340, Title="删除", Permission="sysDictType:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-            new SysMenu{ Id=252885263005350, Pid=252885263005300, Title="任务调度", Path="/platform/job", Name="sysJob", Component="/system/job/index", Icon="ele-AlarmClock", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=130 },
-            new SysMenu{ Id=252885263005351, Pid=252885263005350, Title="查询", Permission="sysJob:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005352, Pid=252885263005350, Title="编辑", Permission="sysJob:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005353, Pid=252885263005350, Title="增加", Permission="sysJob:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005354, Pid=252885263005350, Title="删除", Permission="sysJob:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-            new SysMenu{ Id=252885263005360, Pid=252885263005300, Title="系统监控", Path="/platform/server", Name="sysServer", Component="/system/server/index", Icon="ele-Monitor", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=140 },
-
-            new SysMenu{ Id=252885263005370, Pid=252885263005300, Title="缓存管理", Path="/platform/cache", Name="sysCache", Component="/system/cache/index", Icon="ele-Loading", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=150 },
-            new SysMenu{ Id=252885263005371, Pid=252885263005370, Title="查询", Permission="sysCache:keyList", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005372, Pid=252885263005370, Title="删除", Permission="sysCache:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-            new SysMenu{ Id=252885263005380, Pid=252885263005300, Title="行政区域", Path="/platform/region", Name="sysRegion", Component="/system/region/index", Icon="ele-LocationInformation", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=160 },
-            new SysMenu{ Id=252885263005381, Pid=252885263005380, Title="查询", Permission="sysRegion:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005382, Pid=252885263005380, Title="编辑", Permission="sysRegion:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005383, Pid=252885263005380, Title="增加", Permission="sysRegion:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005384, Pid=252885263005380, Title="删除", Permission="sysRegion:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005385, Pid=252885263005380, Title="同步", Permission="sysRegion:sync", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-            new SysMenu{ Id=252885263005390, Pid=252885263005300, Title="文件管理", Path="/platform/file", Name="sysFile", Component="/system/file/index", Icon="ele-Document", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=170 },
-            new SysMenu{ Id=252885263005391, Pid=252885263005390, Title="查询", Permission="sysFile:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005392, Pid=252885263005390, Title="上传", Permission="sysFile:upload", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005393, Pid=252885263005390, Title="下载", Permission="sysFile:download", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005394, Pid=252885263005390, Title="删除", Permission="sysFile:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-            new SysMenu{ Id=252885263005500, Pid=0, Title="日志管理", Path="/log", Name="log", Component="Layout", Redirect="/log/vislog", Icon="ele-DocumentCopy", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=300 },
-            new SysMenu{ Id=252885263005510, Pid=252885263005500, Title="访问日志", Path="/log/vislog", Name="sysVislog", Component="/system/log/vislog/index", Icon="ele-Document", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005511, Pid=252885263005510, Title="查询", Permission="sysVislog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005512, Pid=252885263005510, Title="清空", Permission="sysVislog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005520, Pid=252885263005500, Title="操作日志", Path="/log/oplog", Name="sysOplog", Component="/system/log/oplog/index", Icon="ele-Document", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=110 },
-            new SysMenu{ Id=252885263005521, Pid=252885263005520, Title="查询", Permission="sysOplog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005522, Pid=252885263005520, Title="清空", Permission="sysOplog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005523, Pid=252885263005520, Title="导出", Permission="sysOplog:export", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005530, Pid=252885263005500, Title="异常日志", Path="/log/exlog", Name="sysExlog", Component="/system/log/exlog/index", Icon="ele-Document", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=120 },
-            new SysMenu{ Id=252885263005531, Pid=252885263005530, Title="查询", Permission="sysExlog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005532, Pid=252885263005530, Title="清空", Permission="sysExlog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005533, Pid=252885263005530, Title="导出", Permission="sysExlog:export", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005540, Pid=252885263005500, Title="差异日志", Path="/log/difflog", Name="sysDifflog", Component="/system/log/difflog/index", Icon="ele-Document", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=130 },
-            new SysMenu{ Id=252885263005541, Pid=252885263005540, Title="查询", Permission="sysDifflog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005542, Pid=252885263005540, Title="清空", Permission="sysDifflog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-
-            new SysMenu{ Id=252885263005600, Pid=0, Title="开发工具", Path="/develop", Name="develop", Component="Layout", Redirect="/develop/database", Icon="ele-Cpu", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=400 },
-            new SysMenu{ Id=252885263005610, Pid=252885263005600, Title="库表管理", Path="/develop/database", Name="sysDatabase", Component="/system/database/index",Icon="ele-Coin", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005620, Pid=252885263005600, Title="表单设计", Path="/develop/formDes", Name="sysFormDes", Component="/system/formDes/index", Icon="ele-Edit", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=101 },
-            new SysMenu{ Id=252885263005630, Pid=252885263005600, Title="代码生成", Path="/develop/codeGen", Name="sysCodeGen", Component="/system/codeGen/index", Icon="ele-Crop", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=102 },
-            new SysMenu{ Id=252885263005640, Pid=252885263005600, Title="系统接口", Path="/develop/api", Name="sysApi", Component="layout/routerView/iframe", IsIframe=true, OutLink="https://localhost:44326/api/", Icon="ele-Help", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=103 },
-
-            new SysMenu{ Id=252885263005700, Pid=0, Title="帮助文档", Path="/doc", Name="doc", Component="Layout", Redirect="/doc/furion", Icon="ele-Notebook", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=500 },
-            new SysMenu{ Id=252885263005710, Pid=252885263005700, Title="后台教程", Path="/doc/furion", Name="sysFurion", Component="layout/routerView/link", IsIframe=false, IsKeepAlive=false, OutLink="https://furion.baiqian.ltd/", Icon="ele-Promotion", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
-            new SysMenu{ Id=252885263005711, Pid=252885263005700, Title="前端教程", Path="/doc/element", Name="sysElement", Component="layout/routerView/link", IsIframe=false, IsKeepAlive=false, OutLink="https://element-plus.gitee.io/zh-CN/", Icon="ele-Position", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=101 },
+            new SysMenu{ Id=252885263055200, Pid=0, Title="系统管理", Path="/system", Name="system", Component="Layout", Redirect="/system/user", Icon="ele-Setting", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=1000 },
+
+            new SysMenu{ Id=252885263055210, Pid=252885263055200, Title="账号管理", Path="/system/user", Name="sysUser", Component="/system/user/index", Icon="ele-User", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055211, Pid=252885263055210, Title="查询", Permission="sysUser:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055212, Pid=252885263055210, Title="编辑", Permission="sysUser:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055213, Pid=252885263055210, Title="增加", Permission="sysUser:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055214, Pid=252885263055210, Title="删除", Permission="sysUser:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055215, Pid=252885263055210, Title="详情", Permission="sysUser:detail", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055216, Pid=252885263055210, Title="授权角色", Permission="sysUser:grantRole", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055217, Pid=252885263055210, Title="重置密码", Permission="sysUser:resetPwd", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055218, Pid=252885263055210, Title="设置状态", Permission="sysUser:setStatus", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055219, Pid=252885263055210, Title="修改密码", Permission="sysUser:changePwd", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055220, Pid=252885263055210, Title="强制下线", Permission="sysUser:forceOffline", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263055230, Pid=252885263055200, Title="角色管理", Path="/system/role", Name="sysRole", Component="/system/role/index", Icon="ele-Help", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=110 },
+            new SysMenu{ Id=252885263055231, Pid=252885263055230, Title="查询", Permission="sysRole:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055232, Pid=252885263055230, Title="编辑", Permission="sysRole:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055233, Pid=252885263055230, Title="增加", Permission="sysRole:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055234, Pid=252885263055230, Title="删除", Permission="sysRole:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055235, Pid=252885263055230, Title="授权菜单", Permission="sysRole:grantMenu", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055236, Pid=252885263055230, Title="授权数据", Permission="sysRole:grantData", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055237, Pid=252885263055230, Title="设置状态", Permission="sysRole:setStatus", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263055240, Pid=252885263055200, Title="机构管理", Path="/system/org", Name="sysOrg", Component="/system/org/index", Icon="ele-OfficeBuilding", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=120 },
+            new SysMenu{ Id=252885263055241, Pid=252885263055240, Title="查询", Permission="sysOrg:list", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055242, Pid=252885263055240, Title="编辑", Permission="sysOrg:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055243, Pid=252885263055240, Title="增加", Permission="sysOrg:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055244, Pid=252885263055240, Title="删除", Permission="sysOrg:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263055250, Pid=252885263055200, Title="职位管理", Path="/system/pos", Name="sysPos", Component="/system/pos/index",Icon="ele-Mug", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=130 },
+            new SysMenu{ Id=252885263055251, Pid=252885263055250, Title="查询", Permission="sysPos:list", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055252, Pid=252885263055250, Title="编辑", Permission="sysPos:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055253, Pid=252885263055250, Title="增加", Permission="sysPos:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055254, Pid=252885263055250, Title="删除", Permission="sysPos:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263055260, Pid=252885263055200, Title="个人中心", Path="/system/userCenter", Name="sysUserCenter", Component="/system/user/component/userCenter",Icon="ele-Medal", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=140 },
+            new SysMenu{ Id=252885263055261, Pid=252885263055260, Title="修改密码", Permission="sysUser:changePwd", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055262, Pid=252885263055260, Title="更新信息", Permission="sysUser:updateBase", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055263, Pid=252885263055260, Title="电子签名", Permission="sysUser:signature", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263055270, Pid=252885263055200, Title="通知公告", Path="/system/notice", Name="sysNotice", Component="/system/notice/index",Icon="ele-Bell", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=150 },
+            new SysMenu{ Id=252885263055271, Pid=252885263055270, Title="查询", Permission="sysNotice:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055272, Pid=252885263055270, Title="编辑", Permission="sysNotice:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055273, Pid=252885263055270, Title="增加", Permission="sysNotice:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055274, Pid=252885263055270, Title="删除", Permission="sysNotice:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055275, Pid=252885263055270, Title="发布", Permission="sysNotice:public", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055276, Pid=252885263055270, Title="撤回", Permission="sysNotice:cancel", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263055280, Pid=252885263055200, Title="三方账号", Path="/system/weChatUser", Name="weChatUser", Component="/system/weChatUser/index",Icon="ele-ChatDotRound", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=160 },
+            new SysMenu{ Id=252885263055281, Pid=252885263055280, Title="查询", Permission="weChatUser:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055282, Pid=252885263055280, Title="编辑", Permission="weChatUser:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055283, Pid=252885263055280, Title="删除", Permission="weChatUser:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263055300, Pid=0, Title="平台管理", Path="/platform", Name="platform", Component="Layout", Redirect="/platform/tenant", Icon="ele-Menu", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=1100 },
+
+            new SysMenu{ Id=252885263055310, Pid=252885263055300, Title="租户管理", Path="/platform/tenant", Name="sysTenant", Component="/system/tenant/index", Icon="ele-School", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055311, Pid=252885263055310, Title="查询", Permission="sysTenant:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055312, Pid=252885263055310, Title="编辑", Permission="sysTenant:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055313, Pid=252885263055310, Title="增加", Permission="sysTenant:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055314, Pid=252885263055310, Title="删除", Permission="sysTenant:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055315, Pid=252885263055310, Title="授权菜单", Permission="sysTenant:grantMenu", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055316, Pid=252885263055310, Title="重置密码", Permission="sysTenant:resetPwd", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055317, Pid=252885263055310, Title="生成库", Permission="sysTenant:createDb", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263055320, Pid=252885263055300, Title="菜单管理", Path="/platform/menu", Name="sysMenu", Component="/system/menu/index", Icon="ele-Menu", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=110 },
+            new SysMenu{ Id=252885263055321, Pid=252885263055320, Title="查询", Permission="sysMenu:list", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055322, Pid=252885263055320, Title="编辑", Permission="sysMenu:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055323, Pid=252885263055320, Title="增加", Permission="sysMenu:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055324, Pid=252885263055320, Title="删除", Permission="sysMenu:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263055330, Pid=252885263055300, Title="参数配置", Path="/platform/config", Name="sysConfig", Component="/system/config/index", Icon="ele-DocumentCopy", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=120 },
+            new SysMenu{ Id=252885263055331, Pid=252885263055330, Title="查询", Permission="sysConfig:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055332, Pid=252885263055330, Title="编辑", Permission="sysConfig:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055333, Pid=252885263055330, Title="增加", Permission="sysConfig:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055334, Pid=252885263055330, Title="删除", Permission="sysConfig:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263055340, Pid=252885263055300, Title="字典管理", Path="/platform/dict", Name="sysDict", Component="/system/dict/index", Icon="ele-Collection", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=130 },
+            new SysMenu{ Id=252885263055341, Pid=252885263055340, Title="查询", Permission="sysDictType:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055342, Pid=252885263055340, Title="编辑", Permission="sysDictType:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055343, Pid=252885263055340, Title="增加", Permission="sysDictType:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055344, Pid=252885263055340, Title="删除", Permission="sysDictType:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263055350, Pid=252885263055300, Title="任务调度", Path="/platform/job", Name="sysJob", Component="/system/job/index", Icon="ele-AlarmClock", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=140 },
+            new SysMenu{ Id=252885263055351, Pid=252885263055350, Title="查询", Permission="sysJob:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055352, Pid=252885263055350, Title="编辑", Permission="sysJob:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055353, Pid=252885263055350, Title="增加", Permission="sysJob:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055354, Pid=252885263055350, Title="删除", Permission="sysJob:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263055360, Pid=252885263055300, Title="系统监控", Path="/platform/server", Name="sysServer", Component="/system/server/index", Icon="ele-Monitor", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=150 },
+
+            new SysMenu{ Id=252885263055370, Pid=252885263055300, Title="缓存管理", Path="/platform/cache", Name="sysCache", Component="/system/cache/index", Icon="ele-Loading", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=160 },
+            new SysMenu{ Id=252885263055371, Pid=252885263055370, Title="查询", Permission="sysCache:keyList", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055372, Pid=252885263055370, Title="删除", Permission="sysCache:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263055380, Pid=252885263055300, Title="行政区域", Path="/platform/region", Name="sysRegion", Component="/system/region/index", Icon="ele-LocationInformation", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=170 },
+            new SysMenu{ Id=252885263055381, Pid=252885263055380, Title="查询", Permission="sysRegion:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055382, Pid=252885263055380, Title="编辑", Permission="sysRegion:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055383, Pid=252885263055380, Title="增加", Permission="sysRegion:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055384, Pid=252885263055380, Title="删除", Permission="sysRegion:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055385, Pid=252885263055380, Title="同步", Permission="sysRegion:sync", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263055390, Pid=252885263055300, Title="文件管理", Path="/platform/file", Name="sysFile", Component="/system/file/index", Icon="ele-Document", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=180 },
+            new SysMenu{ Id=252885263055391, Pid=252885263055390, Title="查询", Permission="sysFile:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055392, Pid=252885263055390, Title="上传", Permission="sysFile:upload", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055393, Pid=252885263055390, Title="下载", Permission="sysFile:download", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055394, Pid=252885263055390, Title="删除", Permission="sysFile:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263055500, Pid=0, Title="日志管理", Path="/log", Name="log", Component="Layout", Redirect="/log/vislog", Icon="ele-DocumentCopy", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=1200 },
+            new SysMenu{ Id=252885263055510, Pid=252885263055500, Title="访问日志", Path="/log/vislog", Name="sysVislog", Component="/system/log/vislog/index", Icon="ele-Document", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055511, Pid=252885263055510, Title="查询", Permission="sysVislog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055512, Pid=252885263055510, Title="清空", Permission="sysVislog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055520, Pid=252885263055500, Title="操作日志", Path="/log/oplog", Name="sysOplog", Component="/system/log/oplog/index", Icon="ele-Document", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=110 },
+            new SysMenu{ Id=252885263055521, Pid=252885263055520, Title="查询", Permission="sysOplog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055522, Pid=252885263055520, Title="清空", Permission="sysOplog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055523, Pid=252885263055520, Title="导出", Permission="sysOplog:export", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055530, Pid=252885263055500, Title="异常日志", Path="/log/exlog", Name="sysExlog", Component="/system/log/exlog/index", Icon="ele-Document", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=120 },
+            new SysMenu{ Id=252885263055531, Pid=252885263055530, Title="查询", Permission="sysExlog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055532, Pid=252885263055530, Title="清空", Permission="sysExlog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055533, Pid=252885263055530, Title="导出", Permission="sysExlog:export", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055540, Pid=252885263055500, Title="差异日志", Path="/log/difflog", Name="sysDifflog", Component="/system/log/difflog/index", Icon="ele-Document", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=130 },
+            new SysMenu{ Id=252885263055541, Pid=252885263055540, Title="查询", Permission="sysDifflog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055542, Pid=252885263055540, Title="清空", Permission="sysDifflog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+
+            new SysMenu{ Id=252885263055600, Pid=0, Title="开发工具", Path="/develop", Name="develop", Component="Layout", Redirect="/develop/database", Icon="ele-Cpu", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=1300 },
+            new SysMenu{ Id=252885263055610, Pid=252885263055600, Title="库表管理", Path="/develop/database", Name="sysDatabase", Component="/system/database/index",Icon="ele-Coin", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055620, Pid=252885263055600, Title="表单设计", Path="/develop/formDes", Name="sysFormDes", Component="/system/formDes/index", Icon="ele-Edit", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=110 },
+            new SysMenu{ Id=252885263055630, Pid=252885263055600, Title="代码生成", Path="/develop/codeGen", Name="sysCodeGen", Component="/system/codeGen/index", Icon="ele-Crop", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=120 },
+            new SysMenu{ Id=252885263055640, Pid=252885263055600, Title="系统接口", Path="/develop/api", Name="sysApi", Component="layout/routerView/iframe", IsIframe=true, OutLink="https://localhost:44326/api/", Icon="ele-Help", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=130 },
+
+            new SysMenu{ Id=252885263055700, Pid=0, Title="帮助文档", Path="/doc", Name="doc", Component="Layout", Redirect="/doc/furion", Icon="ele-Notebook", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=1400 },
+            new SysMenu{ Id=252885263055710, Pid=252885263055700, Title="后台教程", Path="/doc/furion", Name="sysFurion", Component="layout/routerView/link", IsIframe=false, IsKeepAlive=false, OutLink="https://furion.baiqian.ltd/", Icon="ele-Promotion", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
+            new SysMenu{ Id=252885263055711, Pid=252885263055700, Title="前端教程", Path="/doc/element", Name="sysElement", Component="layout/routerView/link", IsIframe=false, IsKeepAlive=false, OutLink="https://element-plus.gitee.io/zh-CN/", Icon="ele-Position", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=110 },
         };
     }
 }

Admin.NET/Admin.NET.Core/SeedData/SysRoleMenuSeedData.cs

@@ -20,102 +20,102 @@ public class SysRoleMenuSeedData : ISqlSugarEntitySeedData<SysRoleMenu>
             new SysRoleMenu{ Id=252885263003002, RoleId=252885263003721, MenuId=252885263002111 },
 
             // 系统管理
-            new SysRoleMenu{ Id=252885263003100, RoleId=252885263003721, MenuId=252885263005200 },
+            new SysRoleMenu{ Id=252885263003100, RoleId=252885263003721, MenuId=252885263055200 },
             // 账号管理
-            new SysRoleMenu{ Id=252885263003101, RoleId=252885263003721, MenuId=252885263005210 },
-            new SysRoleMenu{ Id=252885263003102, RoleId=252885263003721, MenuId=252885263005211 },
-            new SysRoleMenu{ Id=252885263003103, RoleId=252885263003721, MenuId=252885263005212 },
-            new SysRoleMenu{ Id=252885263003104, RoleId=252885263003721, MenuId=252885263005213 },
-            new SysRoleMenu{ Id=252885263003105, RoleId=252885263003721, MenuId=252885263005214 },
-            new SysRoleMenu{ Id=252885263003106, RoleId=252885263003721, MenuId=252885263005215 },
-            new SysRoleMenu{ Id=252885263003107, RoleId=252885263003721, MenuId=252885263005216 },
-            new SysRoleMenu{ Id=252885263003108, RoleId=252885263003721, MenuId=252885263005217 },
-            new SysRoleMenu{ Id=252885263003109, RoleId=252885263003721, MenuId=252885263005218 },
-            new SysRoleMenu{ Id=252885263003110, RoleId=252885263003721, MenuId=252885263005219 },
-            new SysRoleMenu{ Id=252885263013111, RoleId=252885263003721, MenuId=252885263005220 },
+            new SysRoleMenu{ Id=252885263003101, RoleId=252885263003721, MenuId=252885263055210 },
+            new SysRoleMenu{ Id=252885263003102, RoleId=252885263003721, MenuId=252885263055211 },
+            new SysRoleMenu{ Id=252885263003103, RoleId=252885263003721, MenuId=252885263055212 },
+            new SysRoleMenu{ Id=252885263003104, RoleId=252885263003721, MenuId=252885263055213 },
+            new SysRoleMenu{ Id=252885263003105, RoleId=252885263003721, MenuId=252885263055214 },
+            new SysRoleMenu{ Id=252885263003106, RoleId=252885263003721, MenuId=252885263055215 },
+            new SysRoleMenu{ Id=252885263003107, RoleId=252885263003721, MenuId=252885263055216 },
+            new SysRoleMenu{ Id=252885263003108, RoleId=252885263003721, MenuId=252885263055217 },
+            new SysRoleMenu{ Id=252885263003109, RoleId=252885263003721, MenuId=252885263055218 },
+            new SysRoleMenu{ Id=252885263003110, RoleId=252885263003721, MenuId=252885263055219 },
+            new SysRoleMenu{ Id=252885263013111, RoleId=252885263003721, MenuId=252885263055220 },
             // 角色管理
-            new SysRoleMenu{ Id=252885263003111, RoleId=252885263003721, MenuId=252885263005230 },
-            new SysRoleMenu{ Id=252885263003112, RoleId=252885263003721, MenuId=252885263005231 },
-            new SysRoleMenu{ Id=252885263003113, RoleId=252885263003721, MenuId=252885263005232 },
-            new SysRoleMenu{ Id=252885263003114, RoleId=252885263003721, MenuId=252885263005233 },
-            new SysRoleMenu{ Id=252885263003115, RoleId=252885263003721, MenuId=252885263005234 },
-            new SysRoleMenu{ Id=252885263003116, RoleId=252885263003721, MenuId=252885263005235 },
-            new SysRoleMenu{ Id=252885263003117, RoleId=252885263003721, MenuId=252885263005236 },
-            new SysRoleMenu{ Id=252885263003118, RoleId=252885263003721, MenuId=252885263005237 },
+            new SysRoleMenu{ Id=252885263003111, RoleId=252885263003721, MenuId=252885263055230 },
+            new SysRoleMenu{ Id=252885263003112, RoleId=252885263003721, MenuId=252885263055231 },
+            new SysRoleMenu{ Id=252885263003113, RoleId=252885263003721, MenuId=252885263055232 },
+            new SysRoleMenu{ Id=252885263003114, RoleId=252885263003721, MenuId=252885263055233 },
+            new SysRoleMenu{ Id=252885263003115, RoleId=252885263003721, MenuId=252885263055234 },
+            new SysRoleMenu{ Id=252885263003116, RoleId=252885263003721, MenuId=252885263055235 },
+            new SysRoleMenu{ Id=252885263003117, RoleId=252885263003721, MenuId=252885263055236 },
+            new SysRoleMenu{ Id=252885263003118, RoleId=252885263003721, MenuId=252885263055237 },
             // 机构管理
-            new SysRoleMenu{ Id=252885263003131, RoleId=252885263003721, MenuId=252885263005240 },
-            new SysRoleMenu{ Id=252885263003132, RoleId=252885263003721, MenuId=252885263005241 },
-            new SysRoleMenu{ Id=252885263003133, RoleId=252885263003721, MenuId=252885263005242 },
-            new SysRoleMenu{ Id=252885263003134, RoleId=252885263003721, MenuId=252885263005243 },
-            new SysRoleMenu{ Id=252885263003135, RoleId=252885263003721, MenuId=252885263005244 },
+            new SysRoleMenu{ Id=252885263003131, RoleId=252885263003721, MenuId=252885263055240 },
+            new SysRoleMenu{ Id=252885263003132, RoleId=252885263003721, MenuId=252885263055241 },
+            new SysRoleMenu{ Id=252885263003133, RoleId=252885263003721, MenuId=252885263055242 },
+            new SysRoleMenu{ Id=252885263003134, RoleId=252885263003721, MenuId=252885263055243 },
+            new SysRoleMenu{ Id=252885263003135, RoleId=252885263003721, MenuId=252885263055244 },
             // 职位管理
-            new SysRoleMenu{ Id=252885263003141, RoleId=252885263003721, MenuId=252885263005250 },
-            new SysRoleMenu{ Id=252885263003142, RoleId=252885263003721, MenuId=252885263005251 },
-            new SysRoleMenu{ Id=252885263003143, RoleId=252885263003721, MenuId=252885263005252 },
-            new SysRoleMenu{ Id=252885263003144, RoleId=252885263003721, MenuId=252885263005253 },
-            new SysRoleMenu{ Id=252885263003145, RoleId=252885263003721, MenuId=252885263005254 },
+            new SysRoleMenu{ Id=252885263003141, RoleId=252885263003721, MenuId=252885263055250 },
+            new SysRoleMenu{ Id=252885263003142, RoleId=252885263003721, MenuId=252885263055251 },
+            new SysRoleMenu{ Id=252885263003143, RoleId=252885263003721, MenuId=252885263055252 },
+            new SysRoleMenu{ Id=252885263003144, RoleId=252885263003721, MenuId=252885263055253 },
+            new SysRoleMenu{ Id=252885263003145, RoleId=252885263003721, MenuId=252885263055254 },
             // 个人中心
-            new SysRoleMenu{ Id=252885263003151, RoleId=252885263003721, MenuId=252885263005260 },
-            new SysRoleMenu{ Id=252885263003152, RoleId=252885263003721, MenuId=252885263005261 },
-            new SysRoleMenu{ Id=252885263003153, RoleId=252885263003721, MenuId=252885263005262 },
-            new SysRoleMenu{ Id=252885263003154, RoleId=252885263003721, MenuId=252885263005263 },
+            new SysRoleMenu{ Id=252885263003151, RoleId=252885263003721, MenuId=252885263055260 },
+            new SysRoleMenu{ Id=252885263003152, RoleId=252885263003721, MenuId=252885263055261 },
+            new SysRoleMenu{ Id=252885263003153, RoleId=252885263003721, MenuId=252885263055262 },
+            new SysRoleMenu{ Id=252885263003154, RoleId=252885263003721, MenuId=252885263055263 },
             // 通知公告
-            new SysRoleMenu{ Id=252885263003161, RoleId=252885263003721, MenuId=252885263005270 },
-            new SysRoleMenu{ Id=252885263003162, RoleId=252885263003721, MenuId=252885263005271 },
-            new SysRoleMenu{ Id=252885263003163, RoleId=252885263003721, MenuId=252885263005272 },
-            new SysRoleMenu{ Id=252885263003164, RoleId=252885263003721, MenuId=252885263005273 },
-            new SysRoleMenu{ Id=252885263003165, RoleId=252885263003721, MenuId=252885263005274 },
-            new SysRoleMenu{ Id=252885263003166, RoleId=252885263003721, MenuId=252885263005275 },
-            new SysRoleMenu{ Id=252885263003167, RoleId=252885263003721, MenuId=252885263005276 },
+            new SysRoleMenu{ Id=252885263003161, RoleId=252885263003721, MenuId=252885263055270 },
+            new SysRoleMenu{ Id=252885263003162, RoleId=252885263003721, MenuId=252885263055271 },
+            new SysRoleMenu{ Id=252885263003163, RoleId=252885263003721, MenuId=252885263055272 },
+            new SysRoleMenu{ Id=252885263003164, RoleId=252885263003721, MenuId=252885263055273 },
+            new SysRoleMenu{ Id=252885263003165, RoleId=252885263003721, MenuId=252885263055274 },
+            new SysRoleMenu{ Id=252885263003166, RoleId=252885263003721, MenuId=252885263055275 },
+            new SysRoleMenu{ Id=252885263003167, RoleId=252885263003721, MenuId=252885263055276 },
             // 三方账号
-            new SysRoleMenu{ Id=252885263003171, RoleId=252885263003721, MenuId=252885263005280 },
-            new SysRoleMenu{ Id=252885263003172, RoleId=252885263003721, MenuId=252885263005281 },
-            new SysRoleMenu{ Id=252885263003173, RoleId=252885263003721, MenuId=252885263005282 },
-            new SysRoleMenu{ Id=252885263003174, RoleId=252885263003721, MenuId=252885263005283 },
+            new SysRoleMenu{ Id=252885263003171, RoleId=252885263003721, MenuId=252885263055280 },
+            new SysRoleMenu{ Id=252885263003172, RoleId=252885263003721, MenuId=252885263055281 },
+            new SysRoleMenu{ Id=252885263003173, RoleId=252885263003721, MenuId=252885263055282 },
+            new SysRoleMenu{ Id=252885263003174, RoleId=252885263003721, MenuId=252885263055283 },
 
             //// 平台管理
-            //new SysRoleMenu{ Id=252885263003200, RoleId=252885263003721, MenuId=252885263005300 },
+            //new SysRoleMenu{ Id=252885263003200, RoleId=252885263003721, MenuId=252885263055300 },
             // 任务调度
-            new SysRoleMenu{ Id=252885263003221, RoleId=252885263003721, MenuId=252885263005350 },
-            new SysRoleMenu{ Id=252885263003222, RoleId=252885263003721, MenuId=252885263005351 },
-            new SysRoleMenu{ Id=252885263003223, RoleId=252885263003721, MenuId=252885263005352 },
-            new SysRoleMenu{ Id=252885263003224, RoleId=252885263003721, MenuId=252885263005353 },
-            new SysRoleMenu{ Id=252885263003225, RoleId=252885263003721, MenuId=252885263005354 },
+            new SysRoleMenu{ Id=252885263003221, RoleId=252885263003721, MenuId=252885263055350 },
+            new SysRoleMenu{ Id=252885263003222, RoleId=252885263003721, MenuId=252885263055351 },
+            new SysRoleMenu{ Id=252885263003223, RoleId=252885263003721, MenuId=252885263055352 },
+            new SysRoleMenu{ Id=252885263003224, RoleId=252885263003721, MenuId=252885263055353 },
+            new SysRoleMenu{ Id=252885263003225, RoleId=252885263003721, MenuId=252885263055354 },
             // 系统监控
-            new SysRoleMenu{ Id=252885263003231, RoleId=252885263003721, MenuId=252885263005360 },
+            new SysRoleMenu{ Id=252885263003231, RoleId=252885263003721, MenuId=252885263055360 },
             // 缓存管理
-            new SysRoleMenu{ Id=252885263003241, RoleId=252885263003721, MenuId=252885263005370 },
-            new SysRoleMenu{ Id=252885263003242, RoleId=252885263003721, MenuId=252885263005371 },
-            new SysRoleMenu{ Id=252885263003243, RoleId=252885263003721, MenuId=252885263005372 },
+            new SysRoleMenu{ Id=252885263003241, RoleId=252885263003721, MenuId=252885263055370 },
+            new SysRoleMenu{ Id=252885263003242, RoleId=252885263003721, MenuId=252885263055371 },
+            new SysRoleMenu{ Id=252885263003243, RoleId=252885263003721, MenuId=252885263055372 },
             // 行政区域
-            new SysRoleMenu{ Id=252885263003251, RoleId=252885263003721, MenuId=252885263005380 },
-            new SysRoleMenu{ Id=252885263003252, RoleId=252885263003721, MenuId=252885263005381 },
-            new SysRoleMenu{ Id=252885263003253, RoleId=252885263003721, MenuId=252885263005382 },
-            new SysRoleMenu{ Id=252885263003254, RoleId=252885263003721, MenuId=252885263005383 },
-            new SysRoleMenu{ Id=252885263003255, RoleId=252885263003721, MenuId=252885263005384 },
-            new SysRoleMenu{ Id=252885263003256, RoleId=252885263003721, MenuId=252885263005385 },
+            new SysRoleMenu{ Id=252885263003251, RoleId=252885263003721, MenuId=252885263055380 },
+            new SysRoleMenu{ Id=252885263003252, RoleId=252885263003721, MenuId=252885263055381 },
+            new SysRoleMenu{ Id=252885263003253, RoleId=252885263003721, MenuId=252885263055382 },
+            new SysRoleMenu{ Id=252885263003254, RoleId=252885263003721, MenuId=252885263055383 },
+            new SysRoleMenu{ Id=252885263003255, RoleId=252885263003721, MenuId=252885263055384 },
+            new SysRoleMenu{ Id=252885263003256, RoleId=252885263003721, MenuId=252885263055385 },
             // 文件管理
-            new SysRoleMenu{ Id=252885263003261, RoleId=252885263003721, MenuId=252885263005390 },
-            new SysRoleMenu{ Id=252885263003262, RoleId=252885263003721, MenuId=252885263005391 },
-            new SysRoleMenu{ Id=252885263003263, RoleId=252885263003721, MenuId=252885263005392 },
-            new SysRoleMenu{ Id=252885263003264, RoleId=252885263003721, MenuId=252885263005393 },
-            new SysRoleMenu{ Id=252885263003265, RoleId=252885263003721, MenuId=252885263005394 },
+            new SysRoleMenu{ Id=252885263003261, RoleId=252885263003721, MenuId=252885263055390 },
+            new SysRoleMenu{ Id=252885263003262, RoleId=252885263003721, MenuId=252885263055391 },
+            new SysRoleMenu{ Id=252885263003263, RoleId=252885263003721, MenuId=252885263055392 },
+            new SysRoleMenu{ Id=252885263003264, RoleId=252885263003721, MenuId=252885263055393 },
+            new SysRoleMenu{ Id=252885263003265, RoleId=252885263003721, MenuId=252885263055394 },
 
             //// 日志管理
-            //new SysRoleMenu{ Id=252885263003300, RoleId=252885263003721, MenuId=252885263005500 },
-            new SysRoleMenu{ Id=252885263003301, RoleId=252885263003721, MenuId=252885263005510 },
-            new SysRoleMenu{ Id=252885263003302, RoleId=252885263003721, MenuId=252885263005511 },
-            new SysRoleMenu{ Id=252885263003311, RoleId=252885263003721, MenuId=252885263005520 },
-            new SysRoleMenu{ Id=252885263003312, RoleId=252885263003721, MenuId=252885263005521 },
-            new SysRoleMenu{ Id=252885263003321, RoleId=252885263003721, MenuId=252885263005530 },
-            new SysRoleMenu{ Id=252885263003322, RoleId=252885263003721, MenuId=252885263005531 },
-            new SysRoleMenu{ Id=252885263003331, RoleId=252885263003721, MenuId=252885263005540 },
-            new SysRoleMenu{ Id=252885263003332, RoleId=252885263003721, MenuId=252885263005541 },
+            //new SysRoleMenu{ Id=252885263003300, RoleId=252885263003721, MenuId=252885263055500 },
+            new SysRoleMenu{ Id=252885263003301, RoleId=252885263003721, MenuId=252885263055510 },
+            new SysRoleMenu{ Id=252885263003302, RoleId=252885263003721, MenuId=252885263055511 },
+            new SysRoleMenu{ Id=252885263003311, RoleId=252885263003721, MenuId=252885263055520 },
+            new SysRoleMenu{ Id=252885263003312, RoleId=252885263003721, MenuId=252885263055521 },
+            new SysRoleMenu{ Id=252885263003321, RoleId=252885263003721, MenuId=252885263055530 },
+            new SysRoleMenu{ Id=252885263003322, RoleId=252885263003721, MenuId=252885263055531 },
+            new SysRoleMenu{ Id=252885263003331, RoleId=252885263003721, MenuId=252885263055540 },
+            new SysRoleMenu{ Id=252885263003332, RoleId=252885263003721, MenuId=252885263055541 },
 
             // 帮助文档
-            new SysRoleMenu{ Id=252885263003500, RoleId=252885263003721, MenuId=252885263005700 },
-            new SysRoleMenu{ Id=252885263003501, RoleId=252885263003721, MenuId=252885263005710 },
-            new SysRoleMenu{ Id=252885263003502, RoleId=252885263003721, MenuId=252885263005711 },
+            new SysRoleMenu{ Id=252885263003500, RoleId=252885263003721, MenuId=252885263055700 },
+            new SysRoleMenu{ Id=252885263003501, RoleId=252885263003721, MenuId=252885263055710 },
+            new SysRoleMenu{ Id=252885263003502, RoleId=252885263003721, MenuId=252885263055711 },
 
             // 其他角色默认菜单
             // 数据面板【252885263003722】
@@ -123,40 +123,40 @@ public class SysRoleMenuSeedData : ISqlSugarEntitySeedData<SysRoleMenu>
             new SysRoleMenu{ Id=252885263004001, RoleId=252885263003722, MenuId=252885263002110 },
             new SysRoleMenu{ Id=252885263004002, RoleId=252885263003722, MenuId=252885263002111 },
             // 个人中心
-            new SysRoleMenu{ Id=252885263004151, RoleId=252885263003722, MenuId=252885263005260 },
-            new SysRoleMenu{ Id=252885263004152, RoleId=252885263003722, MenuId=252885263005261 },
-            new SysRoleMenu{ Id=252885263004153, RoleId=252885263003722, MenuId=252885263005262 },
-            new SysRoleMenu{ Id=252885263004154, RoleId=252885263003722, MenuId=252885263005263 },
+            new SysRoleMenu{ Id=252885263004151, RoleId=252885263003722, MenuId=252885263055260 },
+            new SysRoleMenu{ Id=252885263004152, RoleId=252885263003722, MenuId=252885263055261 },
+            new SysRoleMenu{ Id=252885263004153, RoleId=252885263003722, MenuId=252885263055262 },
+            new SysRoleMenu{ Id=252885263004154, RoleId=252885263003722, MenuId=252885263055263 },
 
             // 数据面板【252885263003723】
             new SysRoleMenu{ Id=252885263005000, RoleId=252885263003723, MenuId=252885263002100 },
             new SysRoleMenu{ Id=252885263005001, RoleId=252885263003723, MenuId=252885263002110 },
             new SysRoleMenu{ Id=252885263005002, RoleId=252885263003723, MenuId=252885263002111 },
             // 个人中心
-            new SysRoleMenu{ Id=252885263005151, RoleId=252885263003723, MenuId=252885263005260 },
-            new SysRoleMenu{ Id=252885263005152, RoleId=252885263003723, MenuId=252885263005261 },
-            new SysRoleMenu{ Id=252885263005153, RoleId=252885263003723, MenuId=252885263005262 },
-            new SysRoleMenu{ Id=252885263005154, RoleId=252885263003723, MenuId=252885263005263 },
+            new SysRoleMenu{ Id=252885263005151, RoleId=252885263003723, MenuId=252885263055260 },
+            new SysRoleMenu{ Id=252885263005152, RoleId=252885263003723, MenuId=252885263055261 },
+            new SysRoleMenu{ Id=252885263005153, RoleId=252885263003723, MenuId=252885263055262 },
+            new SysRoleMenu{ Id=252885263005154, RoleId=252885263003723, MenuId=252885263055263 },
 
             // 数据面板【252885263003724】
             new SysRoleMenu{ Id=252885263006000, RoleId=252885263003724, MenuId=252885263002100 },
             new SysRoleMenu{ Id=252885263006001, RoleId=252885263003724, MenuId=252885263002110 },
             new SysRoleMenu{ Id=252885263006002, RoleId=252885263003724, MenuId=252885263002111 },
             // 个人中心
-            new SysRoleMenu{ Id=252885263006151, RoleId=252885263003724, MenuId=252885263005260 },
-            new SysRoleMenu{ Id=252885263006152, RoleId=252885263003724, MenuId=252885263005261 },
-            new SysRoleMenu{ Id=252885263006153, RoleId=252885263003724, MenuId=252885263005262 },
-            new SysRoleMenu{ Id=252885263006154, RoleId=252885263003724, MenuId=252885263005263 },
+            new SysRoleMenu{ Id=252885263006151, RoleId=252885263003724, MenuId=252885263055260 },
+            new SysRoleMenu{ Id=252885263006152, RoleId=252885263003724, MenuId=252885263055261 },
+            new SysRoleMenu{ Id=252885263006153, RoleId=252885263003724, MenuId=252885263055262 },
+            new SysRoleMenu{ Id=252885263006154, RoleId=252885263003724, MenuId=252885263055263 },
 
             // 数据面板【252885263003725】
             new SysRoleMenu{ Id=252885263007000, RoleId=252885263003725, MenuId=252885263002100 },
             new SysRoleMenu{ Id=252885263007001, RoleId=252885263003725, MenuId=252885263002110 },
             new SysRoleMenu{ Id=252885263007002, RoleId=252885263003725, MenuId=252885263002111 },
             // 个人中心
-            new SysRoleMenu{ Id=252885263007151, RoleId=252885263003725, MenuId=252885263005260 },
-            new SysRoleMenu{ Id=252885263007152, RoleId=252885263003725, MenuId=252885263005261 },
-            new SysRoleMenu{ Id=252885263007153, RoleId=252885263003725, MenuId=252885263005262 },
-            new SysRoleMenu{ Id=252885263007154, RoleId=252885263003725, MenuId=252885263005263 },
+            new SysRoleMenu{ Id=252885263007151, RoleId=252885263003725, MenuId=252885263055260 },
+            new SysRoleMenu{ Id=252885263007152, RoleId=252885263003725, MenuId=252885263055261 },
+            new SysRoleMenu{ Id=252885263007153, RoleId=252885263003725, MenuId=252885263055262 },
+            new SysRoleMenu{ Id=252885263007154, RoleId=252885263003725, MenuId=252885263055263 },
         };
     }
 }

Admin.NET/Admin.NET.Core/Service/Job/DbJobPersistence.cs

@@ -37,7 +37,7 @@ public class DbJobPersistence : IJobPersistence
             var jobDetail = JobBuilder.Create(dbJob.AssemblyName, dbJob.JobType).LoadFrom(dbJob);
 
             // 加载数据库的触发器
-            var triggerBuilders = new List<TriggerBuilder>();            
+            var triggerBuilders = new List<TriggerBuilder>();
             var dbTriggers = jobTriggerRep.GetList(u => u.JobId == dbJob.JobId)
                 .Select(u => Triggers.Create(u.AssemblyName, u.TriggerType).LoadFrom(u)).ToArray();
             triggerBuilders.AddRange(dbTriggers);
@@ -47,7 +47,7 @@ public class DbJobPersistence : IJobPersistence
             {
                 var triggerId = memTrigger.TriggerId;
                 // 若数据库中已包含这个触发器
-                if (!string.IsNullOrWhiteSpace(triggerId) && dbTriggers.Any(u => u.TriggerId == triggerId)) 
+                if (!string.IsNullOrWhiteSpace(triggerId) && dbTriggers.Any(u => u.TriggerId == triggerId))
                     continue;
                 triggerBuilders.Add(memTrigger);
             }
@@ -59,7 +59,7 @@ public class DbJobPersistence : IJobPersistence
         {
             var jobId = job.GetJobBuilder().JobId;
             // 若数据库中已包含这个作业
-            if (!string.IsNullOrWhiteSpace(jobId) && dbJobs.Any(u => u.JobId == jobId)) 
+            if (!string.IsNullOrWhiteSpace(jobId) && dbJobs.Any(u => u.JobId == jobId))
                 continue;
             schedulerBuilders.Add(job);
         }
@@ -74,18 +74,6 @@ public class DbJobPersistence : IJobPersistence
     /// <returns></returns>
     public SchedulerBuilder OnLoading(SchedulerBuilder builder)
     {
-        using var serviceScope = _serviceProvider.CreateScope();
-        var rep = serviceScope.ServiceProvider.GetService<SqlSugarRepository<SysJobDetail>>();
-        if (builder.Behavior == PersistenceBehavior.Removed)
-        {
-            rep.Delete(u => u.JobId == builder.GetJobBuilder().JobId);
-            return builder.Removed();
-        }
-        if (rep.IsAny(u => u.JobId == builder.GetJobBuilder().JobId))
-        {
-            return builder.Updated();
-        }
-
         return builder;
     }
 

Admin.NET/Admin.NET.Core/Service/Notice/SysNoticeService.cs

@@ -37,6 +37,7 @@ public class SysNoticeService : IDynamicApiController, ITransient
         return await _sysNoticeRep.AsQueryable()
             .WhereIF(!string.IsNullOrWhiteSpace(input.Title), u => u.Title.Contains(input.Title.Trim()))
             .WhereIF(input.Type > 0, u => u.Type == input.Type)
+            .WhereIF(!_userManager.SuperAdmin, u => u.CreateUserId == _userManager.UserId)
             .OrderBy(u => u.CreateTime, OrderByType.Desc)
             .ToPagedListAsync(input.Page, input.PageSize);
     }

Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs

@@ -210,12 +210,12 @@ public class SysTenantService : IDynamicApiController, ITransient
 
         // 默认租户管理员角色菜单集合
         var menuIdList = new List<long> { 252885263002100,252885263002110,252885263002111,
-            252885263005200,252885263005210,252885263005211,252885263005212,252885263005213,252885263005214,252885263005215,252885263005216,252885263005217,252885263005218,252885263005219,252885263005220,
-            252885263005230,252885263005231,252885263005232,252885263005233,252885263005234,252885263005235,252885263005236,252885263005237,
-            252885263005240,252885263005241,252885263005242,252885263005243,252885263005244,
-            252885263005250,252885263005251,252885263005252,252885263005253,252885263005254,
-            252885263005260,252885263005261,252885263005262,252885263005263,
-            252885263005270,252885263005271,252885263005272,252885263005273,252885263005274,252885263005275,252885263005276
+            252885263055200,252885263055210,252885263055211,252885263055212,252885263055213,252885263055214,252885263055215,252885263055216,252885263055217,252885263055218,252885263055219,252885263055220,
+            252885263055230,252885263055231,252885263055232,252885263055233,252885263055234,252885263055235,252885263055236,252885263055237,
+            252885263055240,252885263055241,252885263055242,252885263055243,252885263055244,
+            252885263055250,252885263055251,252885263055252,252885263055253,252885263055254,
+            252885263055260,252885263055261,252885263055262,252885263055263,
+            252885263055270,252885263055271,252885263055272,252885263055273,252885263055274,252885263055275,252885263055276
         };
         await _sysRoleMenuService.GrantRoleMenu(new RoleMenuInput() { Id = newRole.Id, MenuIdList = menuIdList });
     }

Admin.NET/Admin.NET.Core/Service/User/SysUserService.cs

@@ -32,27 +32,17 @@ public class SysUserService : IDynamicApiController, ITransient
     /// 获取用户分页列表
     /// </summary>
     /// <param name="input"></param>
-    /// <param name="extorg">是否查询附加组织机构</param>
     /// <returns></returns>
     [HttpGet("/sysUser/page")]
-    public async Task<SqlSugarPagedList<SysUser>> GetUserPage([FromQuery] PageUserInput input, bool extorg = false)
+    public async Task<SqlSugarPagedList<SysUser>> GetUserPage([FromQuery] PageUserInput input)
     {
         var orgList = input.OrgId > 0 ? await _sysOrgService.GetChildIdListWithSelfById(input.OrgId) :
-           _userManager.SuperAdmin ? null : await _sysOrgService.GetUserOrgIdList(); // 各管理员只能看到自己机构下的用户列表
-        if (extorg)
-            return await _sysUserRep.AsQueryable()
-            .LeftJoin<SysUserExtOrg>((o, org) => o.Id == org.UserId)
-            .WhereIF(!_userManager.SuperAdmin, o => o.AccountType != AccountTypeEnum.SuperAdmin)
-            .WhereIF(orgList != null, (o, org) => orgList.Contains(o.OrgId) || orgList.Contains(org.OrgId)) // 查询附加组织机构
-            .WhereIF(!string.IsNullOrWhiteSpace(input.Account), u => u.Account.Contains(input.Account))
-            .WhereIF(!string.IsNullOrWhiteSpace(input.RealName), u => u.RealName.Contains(input.RealName))
-            .WhereIF(!string.IsNullOrWhiteSpace(input.Phone), u => u.Phone.Contains(input.Phone))
-            .OrderBy(u => u.OrderNo)
-            .ToPagedListAsync(input.Page, input.PageSize);
-        else
-            return await _sysUserRep.AsQueryable()
+            _userManager.SuperAdmin ? null : await _sysOrgService.GetUserOrgIdList(); // 各管理员只能看到自己机构下的用户列表
+
+        return await _sysUserRep.AsQueryable()
+            .LeftJoin<SysUserExtOrg>((u, o) => u.Id == o.UserId)
             .WhereIF(!_userManager.SuperAdmin, u => u.AccountType != AccountTypeEnum.SuperAdmin)
-            .WhereIF(orgList != null, u => orgList.Contains(u.OrgId))
+            .WhereIF(orgList != null, (u, o) => orgList.Contains(u.OrgId) || orgList.Contains(o.OrgId))
             .WhereIF(!string.IsNullOrWhiteSpace(input.Account), u => u.Account.Contains(input.Account))
             .WhereIF(!string.IsNullOrWhiteSpace(input.RealName), u => u.RealName.Contains(input.RealName))
             .WhereIF(!string.IsNullOrWhiteSpace(input.Phone), u => u.Phone.Contains(input.Phone))

Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs

@@ -18,7 +18,9 @@ public static class SqlSugarSetup
         {
             dbOptions.ConnectionConfigs.ForEach(config =>
             {
-                SetDbAop(db.GetConnectionScope(config.ConfigId));
+                var dbProvider = db.GetConnectionScope(config.ConfigId);
+                SetDbAop(dbProvider);
+                SetDbDiffLog(dbProvider, config);
             });
         });
 
@@ -44,11 +46,15 @@ public static class SqlSugarSetup
 
         var configureExternalServices = new ConfigureExternalServices
         {
-            EntityService = (type, column) => // 修改列可空-1、带?问号 2、String类型若没有Required
+            EntityNameService = (type, entity) => // 处理表
             {
-                if ((type.PropertyType.IsGenericType && type.PropertyType.GetGenericTypeDefinition() == typeof(Nullable<>))
-                    || (type.PropertyType == typeof(string) && type.GetCustomAttribute<RequiredAttribute>() == null))
+                entity.DbTableName = UtilMethods.ToUnderLine(entity.DbTableName); // 驼峰转下划线
+            },
+            EntityService = (type, column) => // 处理列
+            {
+                if (new NullabilityInfoContext().Create(type).WriteState is NullabilityState.Nullable)
                     column.IsNullable = true;
+                // column.DbColumnName = UtilMethods.ToUnderLine(column.DbColumnName ?? column.PropertyName); // 驼峰转下划线
             },
             DataInfoCacheService = new SqlSugarCache(),
         };
@@ -96,7 +102,6 @@ public static class SqlSugarSetup
         // 数据审计
         db.Aop.DataExecuting = (oldValue, entityInfo) =>
         {
-            // 新增操作
             if (entityInfo.OperationType == DataFilterType.InsertByObject)
             {
                 // 主键(long类型)非自增且没有值的---赋值雪花Id
@@ -122,7 +127,6 @@ public static class SqlSugarSetup
                         entityInfo.SetValue(App.User.FindFirst(ClaimConst.OrgId)?.Value);
                 }
             }
-            // 更新操作
             if (entityInfo.OperationType == DataFilterType.UpdateByObject)
             {
                 if (entityInfo.PropertyName == "UpdateTime")
@@ -132,30 +136,6 @@ public static class SqlSugarSetup
             }
         };
 
-        //// 差异日志
-        //db.Aop.OnDiffLogEvent = async u =>
-        //{
-        //    if (!config.EnableDiffLog) return;
-
-        //    var LogDiff = new SysLogDiff
-        //    {
-        //        // 操作后记录（字段描述、列名、值、表名、表描述）
-        //        AfterData = JsonConvert.SerializeObject(u.AfterData),
-        //        // 操作前记录（字段描述、列名、值、表名、表描述）
-        //        BeforeData = JsonConvert.SerializeObject(u.BeforeData),
-        //        // 传进来的对象
-        //        BusinessData = JsonConvert.SerializeObject(u.BusinessData),
-        //        // 枚举（insert、update、delete）
-        //        DiffType = u.DiffType.ToString(),
-        //        Sql = UtilMethods.GetSqlString(config.DbType, u.Sql, u.Parameters),
-        //        Parameters = JsonConvert.SerializeObject(u.Parameters),
-        //        Duration = u.Time == null ? 0 : (long)u.Time.Value.TotalMilliseconds
-        //    };
-        //    await db.AsTenant().GetConnectionScope(SqlSugarConst.ConfigId).Insertable(LogDiff).ExecuteCommandAsync();
-        //    Console.ForegroundColor = ConsoleColor.Red;
-        //    Console.WriteLine(DateTime.Now + $"\r\n**********差异日志开始**********\r\n{Environment.NewLine}{JsonConvert.SerializeObject(LogDiff)}{Environment.NewLine}**********差异日志结束**********\r\n");
-        //};
-
         // 超管时排除各种过滤器
         if (App.User?.FindFirst(ClaimConst.AccountType)?.Value == ((int)AccountTypeEnum.SuperAdmin).ToString())
             return;
@@ -171,6 +151,37 @@ public static class SqlSugarSetup
     }
 
     /// <summary>
+    /// 开启库表差异化日志
+    /// </summary>
+    /// <param name="db"></param>
+    /// <param name="config"></param>
+    private static void SetDbDiffLog(SqlSugarScopeProvider db, DbConnectionConfig config)
+    {
+        if (!config.EnableDiffLog) return;
+
+        db.Aop.OnDiffLogEvent = async u =>
+        {
+            var logDiff = new SysLogDiff
+            {
+                // 操作后记录（字段描述、列名、值、表名、表描述）
+                AfterData = JsonConvert.SerializeObject(u.AfterData),
+                // 操作前记录（字段描述、列名、值、表名、表描述）
+                BeforeData = JsonConvert.SerializeObject(u.BeforeData),
+                // 传进来的对象
+                BusinessData = JsonConvert.SerializeObject(u.BusinessData),
+                // 枚举（insert、update、delete）
+                DiffType = u.DiffType.ToString(),
+                Sql = UtilMethods.GetSqlString(config.DbType, u.Sql, u.Parameters),
+                Parameters = JsonConvert.SerializeObject(u.Parameters),
+                Duration = u.Time == null ? 0 : (long)u.Time.Value.TotalMilliseconds
+            };
+            await db.Insertable(logDiff).ExecuteCommandAsync();
+            Console.ForegroundColor = ConsoleColor.Red;
+            Console.WriteLine(DateTime.Now + $"\r\n*****差异日志开始*****\r\n{Environment.NewLine}{JsonConvert.SerializeObject(logDiff)}{Environment.NewLine}*****差异日志结束*****\r\n");
+        };
+    }
+
+    /// <summary>
     /// 初始化数据库
     /// </summary>
     /// <param name="db"></param>

Admin.NET/Admin.NET.Web.Entry/Properties/PublishProfiles/FolderProfile.pubxml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121. 
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <DeleteExistingFiles>True</DeleteExistingFiles>
-    <ExcludeApp_Data>False</ExcludeApp_Data>
-    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
-    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>publish\</PublishUrl>
-    <WebPublishMethod>FileSystem</WebPublishMethod>
-    <SiteUrlToLaunchAfterPublish />
-    <TargetFramework>net6.0</TargetFramework>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <ProjectGuid>11ea630b-4600-4236-a117-ce6c6cd67586</ProjectGuid>
-    <SelfContained>false</SelfContained>
-  </PropertyGroup>
-</Project>

Admin.NET/Admin.NET.Web.Entry/Properties/PublishProfiles/FolderProfile1.pubxml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
--->
-<Project>
-  <PropertyGroup>
-    <DeleteExistingFiles>true</DeleteExistingFiles>
-    <ExcludeApp_Data>false</ExcludeApp_Data>
-    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
-    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>publish\</PublishUrl>
-    <WebPublishMethod>FileSystem</WebPublishMethod>
-    <SiteUrlToLaunchAfterPublish />
-    <TargetFramework>net6.0</TargetFramework>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <PublishSingleFile>true</PublishSingleFile>
-    <PublishReadyToRun>true</PublishReadyToRun>
-    <ProjectGuid>11ea630b-4600-4236-a117-ce6c6cd67586</ProjectGuid>
-    <SelfContained>true</SelfContained>
-  </PropertyGroup>
-</Project>

Admin.NET/Admin.NET.Web.Entry/Properties/PublishProfiles/FolderProfile1.pubxml.user

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
--->
-<Project>
-  <PropertyGroup>
-    <_PublishTargetUrl>D:\CODEWORK\Admin.NET\Admin.NET\Admin.NET.Web.Entry\publish\</_PublishTargetUrl>
-    <History>True|2022-06-11T15:23:24.0217186Z;</History>
-  </PropertyGroup>
-</Project>

Web/src/components/editor/index.vue

@@ -1,14 +1,7 @@
 <template>
 	<div class="editor-container">
 		<Toolbar :editor="editorRef" :mode="mode" />
-		<Editor
-			:mode="mode"
-			:defaultConfig="state.editorConfig"
-			:style="{ height }"
-			v-model="state.editorVal"
-			@onCreated="handleCreated"
-			@onChange="handleChange"
-		/>
+		<Editor :mode="mode" :defaultConfig="state.editorConfig" :style="{ height }" v-model="state.editorVal" @onCreated="handleCreated" @onChange="handleChange" />
 	</div>
 </template>
 
@@ -88,4 +81,14 @@ watch(
 		deep: true,
 	}
 );
+// 监听双向绑定值改变
+watch(
+	() => props.getHtml,
+	(val) => {
+		state.editorVal = val;
+	},
+	{
+		deep: true,
+	}
+);
 </script>

Web/src/layout/main/columns.vue

@@ -35,7 +35,7 @@ const updateScrollbar = () => {
 	// 更新父级 scrollbar
 	layoutScrollbarRef.value.update();
 	// 更新子级 scrollbar
-	layoutMainRef.value!.layoutMainScrollbarRef.update();
+	layoutMainRef.value?.layoutMainScrollbarRef.update();
 };
 // 重置滚动条高度，由于组件是异步引入的
 const initScrollBarHeight = () => {

Web/src/layout/routerView/parent.vue

@@ -82,7 +82,10 @@ onMounted(() => {
 	// https://gitee.com/lyt-top/vue-next-admin/issues/I59RXK
 	nextTick(() => {
 		setTimeout(() => {
-			if (themeConfig.value.isCacheTagsView) cachedViews.value = Session.get('tagsViewList')?.map((item: RouteItem) => item.name);
+			if (themeConfig.value.isCacheTagsView) {
+				let tagsViewArr: RouteItem[] = Session.get('tagsViewList') || [];
+				cachedViews.value = tagsViewArr.filter((item) => item.meta?.isKeepAlive).map((item) => item.name as string);
+			}
 		}, 0);
 	});
 });

Web/src/views/system/notice/component/editNotice.vue

@@ -24,7 +24,7 @@
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="内容" prop="content" :rules="[{ required: true, message: '内容不能为空', trigger: 'blur' }]">
-							<Editor v-model="ruleForm.content" />
+							<Editor v-model:get-html="ruleForm.content" />
 						</el-form-item>
 					</el-col>
 				</el-row>

Web/src/views/system/role/component/editRole.vue

@@ -16,7 +16,7 @@
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="角色编码" prop="code" :rules="[{ required: true, message: '角色编码不能为空', trigger: 'blur' }]">
-							<el-input v-model="ruleForm.code" placeholder="角色编码" clearable />
+							<el-input v-model="ruleForm.code" placeholder="角色编码" clearable :disabled="ruleForm.code == 'sys_admin' && ruleForm.id != undefined" />
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
@@ -44,7 +44,7 @@
 								:data="menuData"
 								node-key="id"
 								show-checkbox
-								:props="{ children: 'children', label: 'title', class: treeNodeClass }"
+								:props="{ children: 'children', label: 'title', class: treeNodeClass, disabled: () => ruleForm.code == 'sys_admin' && ruleForm.id != undefined }"
 								icon="ele-Menu"
 								highlight-current
 								default-expand-all