Procházet zdrojové kódy

调整排序order关键字适配oracle数据库

zuohuaijun před 3 roky
rodič
revize
8b7c87a6d8
83 změnil soubory, kde provedl 326 přidání a 587 odebrání
  1. 2 2
      Admin.NET/Admin.NET.Application/SeedData/SysMenuSeedData.cs
  2. 25 25
      Admin.NET/Admin.NET.Core/Admin.NET.Core.xml
  3. 1 1
      Admin.NET/Admin.NET.Core/Entity/SysConfig.cs
  4. 1 1
      Admin.NET/Admin.NET.Core/Entity/SysDictData.cs
  5. 1 1
      Admin.NET/Admin.NET.Core/Entity/SysDictType.cs
  6. 1 1
      Admin.NET/Admin.NET.Core/Entity/SysMenu.cs
  7. 1 1
      Admin.NET/Admin.NET.Core/Entity/SysOrg.cs
  8. 1 1
      Admin.NET/Admin.NET.Core/Entity/SysPos.cs
  9. 1 1
      Admin.NET/Admin.NET.Core/Entity/SysRegion.cs
  10. 1 1
      Admin.NET/Admin.NET.Core/Entity/SysRole.cs
  11. 1 1
      Admin.NET/Admin.NET.Core/Entity/SysTenant.cs
  12. 0 91
      Admin.NET/Admin.NET.Core/Entity/SysTimer.cs
  13. 1 1
      Admin.NET/Admin.NET.Core/Entity/SysUser.cs
  14. 6 6
      Admin.NET/Admin.NET.Core/SeedData/SysConfigSeedData.cs
  15. 36 36
      Admin.NET/Admin.NET.Core/SeedData/SysDictDataSeedData.cs
  16. 4 4
      Admin.NET/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs
  17. 135 135
      Admin.NET/Admin.NET.Core/SeedData/SysMenuSeedData.cs
  18. 1 1
      Admin.NET/Admin.NET.Core/Service/Config/SysConfigService.cs
  19. 2 2
      Admin.NET/Admin.NET.Core/Service/Dict/SysDictDataService.cs
  20. 2 2
      Admin.NET/Admin.NET.Core/Service/Dict/SysDictTypeService.cs
  21. 16 19
      Admin.NET/Admin.NET.Core/Service/Menu/Dto/MenuOutput.cs
  22. 5 5
      Admin.NET/Admin.NET.Core/Service/Menu/SysMenuService.cs
  23. 1 1
      Admin.NET/Admin.NET.Core/Service/Org/SysOrgService.cs
  24. 1 1
      Admin.NET/Admin.NET.Core/Service/Pos/SysPosService.cs
  25. 2 2
      Admin.NET/Admin.NET.Core/Service/Role/SysRoleService.cs
  26. 1 1
      Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs
  27. 1 1
      Admin.NET/Admin.NET.Core/Service/User/SysUserService.cs
  28. 1 1
      Web/.eslintrc.js
  29. 0 89
      Web/src/api-services/apis/sys-role-api.ts
  30. 4 81
      Web/src/api-services/apis/sys-tenant-api.ts
  31. 1 1
      Web/src/api-services/models/add-config-input.ts
  32. 1 1
      Web/src/api-services/models/add-dict-data-input.ts
  33. 1 1
      Web/src/api-services/models/add-dict-type-input.ts
  34. 1 1
      Web/src/api-services/models/add-menu-input.ts
  35. 1 1
      Web/src/api-services/models/add-org-input.ts
  36. 1 1
      Web/src/api-services/models/add-pos-input.ts
  37. 1 1
      Web/src/api-services/models/add-region-input.ts
  38. 1 1
      Web/src/api-services/models/add-role-input.ts
  39. 1 1
      Web/src/api-services/models/add-tenant-input.ts
  40. 1 1
      Web/src/api-services/models/add-user-input.ts
  41. 19 0
      Web/src/api-services/models/menu-output.ts
  42. 1 1
      Web/src/api-services/models/sys-config.ts
  43. 1 1
      Web/src/api-services/models/sys-dict-data.ts
  44. 1 1
      Web/src/api-services/models/sys-dict-type.ts
  45. 0 19
      Web/src/api-services/models/sys-menu-meta.ts
  46. 1 1
      Web/src/api-services/models/sys-menu.ts
  47. 1 1
      Web/src/api-services/models/sys-org.ts
  48. 1 1
      Web/src/api-services/models/sys-pos.ts
  49. 1 1
      Web/src/api-services/models/sys-region.ts
  50. 1 1
      Web/src/api-services/models/sys-role.ts
  51. 1 1
      Web/src/api-services/models/sys-user.ts
  52. 1 1
      Web/src/api-services/models/tenant-output.ts
  53. 1 1
      Web/src/api-services/models/update-config-input.ts
  54. 1 1
      Web/src/api-services/models/update-dict-data-input.ts
  55. 1 1
      Web/src/api-services/models/update-dict-type-input.ts
  56. 1 1
      Web/src/api-services/models/update-menu-input.ts
  57. 1 1
      Web/src/api-services/models/update-org-input.ts
  58. 1 1
      Web/src/api-services/models/update-pos-input.ts
  59. 1 1
      Web/src/api-services/models/update-region-input.ts
  60. 1 1
      Web/src/api-services/models/update-role-input.ts
  61. 1 1
      Web/src/api-services/models/update-tenant-input.ts
  62. 1 1
      Web/src/api-services/models/update-user-input.ts
  63. 1 1
      Web/src/views/system/config/component/editConfig.vue
  64. 1 1
      Web/src/views/system/config/index.vue
  65. 1 1
      Web/src/views/system/dict/component/dictDataDialog.vue
  66. 1 1
      Web/src/views/system/dict/component/editDictData.vue
  67. 1 1
      Web/src/views/system/dict/component/editDictType.vue
  68. 1 1
      Web/src/views/system/dict/index.vue
  69. 2 2
      Web/src/views/system/menu/component/editMenu.vue
  70. 1 1
      Web/src/views/system/menu/index.vue
  71. 1 2
      Web/src/views/system/onlineUser/signalR.ts
  72. 1 1
      Web/src/views/system/org/component/editOrg.vue
  73. 1 1
      Web/src/views/system/org/index.vue
  74. 1 1
      Web/src/views/system/pos/component/editPos.vue
  75. 1 1
      Web/src/views/system/pos/index.vue
  76. 1 1
      Web/src/views/system/region/component/editRegion.vue
  77. 1 1
      Web/src/views/system/region/index.vue
  78. 1 1
      Web/src/views/system/role/component/editRole.vue
  79. 1 1
      Web/src/views/system/role/index.vue
  80. 1 1
      Web/src/views/system/tenant/component/editTenant.vue
  81. 1 1
      Web/src/views/system/tenant/index.vue
  82. 1 1
      Web/src/views/system/user/component/editUser.vue
  83. 1 1
      Web/src/views/system/user/index.vue

+ 2 - 2
Admin.NET/Admin.NET.Application/SeedData/SysMenuSeedData.cs

@@ -13,8 +13,8 @@ public class SysMenuSeedData : ISqlSugarEntitySeedData<SysMenu>
     {
         return new[]
         {
-            new SysMenu{ Id=252885263002200, Pid=0, Title="业务测试", Path="/test", Name="test", Component="Layout", Redirect="/test/tenant", Icon="ele-Position", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=20 },
-            new SysMenu{ Id=252885263002201, Pid=252885263002200, Title="租户业务", Path="/test/tenant", Name="testTenant", Component="/test/tenant/index", Icon="ele-OfficeBuilding", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
+            new SysMenu{ Id=252885263002200, Pid=0, Title="业务测试", Path="/test", Name="test", Component="Layout", Redirect="/test/tenant", Icon="ele-Position", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=20 },
+            new SysMenu{ Id=252885263002201, Pid=252885263002200, Title="租户业务", Path="/test/tenant", Name="testTenant", Component="/test/tenant/index", Icon="ele-OfficeBuilding", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
         };
     }
 }

+ 25 - 25
Admin.NET/Admin.NET.Core/Admin.NET.Core.xml

@@ -522,7 +522,7 @@
             分组编码
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.SysConfig.Order">
+        <member name="P:Admin.NET.Core.SysConfig.OrderNo">
             <summary>
             排序
             </summary>
@@ -557,7 +557,7 @@
             编码
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.SysDictData.Order">
+        <member name="P:Admin.NET.Core.SysDictData.OrderNo">
             <summary>
             排序
             </summary>
@@ -587,7 +587,7 @@
             编码
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.SysDictType.Order">
+        <member name="P:Admin.NET.Core.SysDictType.OrderNo">
             <summary>
             排序
             </summary>
@@ -1147,7 +1147,7 @@
             是否固定
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.SysMenu.Order">
+        <member name="P:Admin.NET.Core.SysMenu.OrderNo">
             <summary>
             排序
             </summary>
@@ -1317,7 +1317,7 @@
             编码
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.SysOrg.Order">
+        <member name="P:Admin.NET.Core.SysOrg.OrderNo">
             <summary>
             排序
             </summary>
@@ -1352,7 +1352,7 @@
             编码
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.SysPos.Order">
+        <member name="P:Admin.NET.Core.SysPos.OrderNo">
             <summary>
             排序
             </summary>
@@ -1427,7 +1427,7 @@
             维度
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.SysRegion.Order">
+        <member name="P:Admin.NET.Core.SysRegion.OrderNo">
             <summary>
             排序
             </summary>
@@ -1457,7 +1457,7 @@
             编码
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.SysRole.Order">
+        <member name="P:Admin.NET.Core.SysRole.OrderNo">
             <summary>
             排序
             </summary>
@@ -1557,7 +1557,7 @@
             数据库标识
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.SysTenant.Order">
+        <member name="P:Admin.NET.Core.SysTenant.OrderNo">
             <summary>
             排序
             </summary>
@@ -1687,7 +1687,7 @@
             个人简介
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.SysUser.Order">
+        <member name="P:Admin.NET.Core.SysUser.OrderNo">
             <summary>
             排序
             </summary>
@@ -5631,6 +5631,21 @@
             重定向
             </summary>
         </member>
+        <member name="P:Admin.NET.Core.Service.MenuOutput.OrderNo">
+            <summary>
+            排序
+            </summary>
+        </member>
+        <member name="P:Admin.NET.Core.Service.MenuOutput.Status">
+            <summary>
+            状态
+            </summary>
+        </member>
+        <member name="P:Admin.NET.Core.Service.MenuOutput.Remark">
+            <summary>
+            备注
+            </summary>
+        </member>
         <member name="P:Admin.NET.Core.Service.MenuOutput.Meta">
             <summary>
             菜单Meta
@@ -5681,21 +5696,6 @@
             是否固定
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.Service.SysMenuMeta.Order">
-            <summary>
-            排序
-            </summary>
-        </member>
-        <member name="P:Admin.NET.Core.Service.SysMenuMeta.Status">
-            <summary>
-            状态
-            </summary>
-        </member>
-        <member name="P:Admin.NET.Core.Service.SysMenuMeta.Remark">
-            <summary>
-            备注
-            </summary>
-        </member>
         <member name="T:Admin.NET.Core.Service.SysMenuMapper">
             <summary>
             配置菜单对象映射

+ 1 - 1
Admin.NET/Admin.NET.Core/Entity/SysConfig.cs

@@ -44,7 +44,7 @@ public class SysConfig : EntityBase
     /// 排序
     /// </summary>
     [SugarColumn(ColumnDescription = "排序")]
-    public int Order { get; set; } = 100;
+    public int OrderNo { get; set; } = 100;
 
     /// <summary>
     /// 备注

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

@@ -37,7 +37,7 @@ public class SysDictData : EntityBase
     /// 排序
     /// </summary>
     [SugarColumn(ColumnDescription = "排序")]
-    public int Order { get; set; } = 100;
+    public int OrderNo { get; set; } = 100;
 
     /// <summary>
     /// 备注

+ 1 - 1
Admin.NET/Admin.NET.Core/Entity/SysDictType.cs

@@ -24,7 +24,7 @@ public class SysDictType : EntityBase
     /// 排序
     /// </summary>
     [SugarColumn(ColumnDescription = "排序")]
-    public int Order { get; set; } = 100;
+    public int OrderNo { get; set; } = 100;
 
     /// <summary>
     /// 备注

+ 1 - 1
Admin.NET/Admin.NET.Core/Entity/SysMenu.cs

@@ -102,7 +102,7 @@ public class SysMenu : EntityBase
     /// 排序
     /// </summary>
     [SugarColumn(ColumnDescription = "排序")]
-    public int Order { get; set; } = 100;
+    public int OrderNo { get; set; } = 100;
 
     /// <summary>
     /// 状态

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

@@ -30,7 +30,7 @@ public class SysOrg : EntityTenant
     /// 排序
     /// </summary>
     [SugarColumn(ColumnDescription = "排序")]
-    public int Order { get; set; } = 100;
+    public int OrderNo { get; set; } = 100;
 
     /// <summary>
     /// 备注

+ 1 - 1
Admin.NET/Admin.NET.Core/Entity/SysPos.cs

@@ -24,7 +24,7 @@ public class SysPos : EntityTenant
     /// 排序
     /// </summary>
     [SugarColumn(ColumnDescription = "排序")]
-    public int Order { get; set; } = 100;
+    public int OrderNo { get; set; } = 100;
 
     /// <summary>
     /// 备注

+ 1 - 1
Admin.NET/Admin.NET.Core/Entity/SysRegion.cs

@@ -83,7 +83,7 @@ public class SysRegion : EntityBaseId
     /// 排序
     /// </summary>
     [SugarColumn(ColumnDescription = "排序")]
-    public int Order { get; set; } = 100;
+    public int OrderNo { get; set; } = 100;
 
     /// <summary>
     /// 备注

+ 1 - 1
Admin.NET/Admin.NET.Core/Entity/SysRole.cs

@@ -24,7 +24,7 @@ public class SysRole : EntityTenant
     /// 排序
     /// </summary>
     [SugarColumn(ColumnDescription = "排序")]
-    public int Order { get; set; } = 100;
+    public int OrderNo { get; set; } = 100;
 
     /// <summary>
     /// 数据范围(1全部数据 2本部门及以下数据 3本部门数据 4仅本人数据 5自定义数据)

+ 1 - 1
Admin.NET/Admin.NET.Core/Entity/SysTenant.cs

@@ -55,7 +55,7 @@ public class SysTenant : EntityBase
     /// 排序
     /// </summary>
     [SugarColumn(ColumnDescription = "排序")]
-    public int Order { get; set; } = 100;
+    public int OrderNo { get; set; } = 100;
 
     /// <summary>
     /// 备注

+ 0 - 91
Admin.NET/Admin.NET.Core/Entity/SysTimer.cs

@@ -1,91 +0,0 @@
-//namespace Admin.NET.Core;
-
-///// <summary>
-///// 定时任务
-///// </summary>
-//[SugarTable("sys_timer", "定时任务表")]
-//public class SysTimer : EntityBase
-//{
-//    /// <summary>
-//    /// 任务名称
-//    /// </summary>
-//    [SugarColumn(ColumnDescription = "任务名称", Length = 64)]
-//    [Required, MaxLength(64)]
-//    public virtual string TimerName { get; set; }
-
-//    /// <summary>
-//    /// 是否只执行一次
-//    /// </summary>
-//    [SugarColumn(ColumnDescription = "是否只执行一次")]
-//    public bool DoOnce { get; set; } = false;
-
-//    /// <summary>
-//    /// 是否立即执行
-//    /// </summary>
-//    [SugarColumn(ColumnDescription = "是否立即执行")]
-//    public bool StartNow { get; set; } = false;
-
-//    /// <summary>
-//    /// 执行类型(串行并行)
-//    /// </summary>
-//    [SugarColumn(ColumnDescription = "执行类型")]
-//    public SpareTimeExecuteTypes ExecuteType { get; set; } = SpareTimeExecuteTypes.Parallel;
-
-//    /// <summary>
-//    /// 执行间隔(单位秒)
-//    /// </summary>
-//    /// <example>5</example>
-//    [SugarColumn(ColumnDescription = "执行间隔")]
-//    public int? Interval { get; set; } = 5;
-
-//    /// <summary>
-//    /// Cron表达式
-//    /// </summary>
-//    [SugarColumn(ColumnDescription = "Cron表达式", Length = 128)]
-//    [MaxLength(128)]
-//    public string Cron { get; set; }
-
-//    /// <summary>
-//    /// 定时器类型
-//    /// </summary>
-//    [SugarColumn(ColumnDescription = "定时器类型")]
-//    public SpareTimeTypes TimerType { get; set; } = SpareTimeTypes.Interval;
-
-//    /// <summary>
-//    /// 请求url
-//    /// </summary>
-//    [SugarColumn(ColumnDescription = "请求url", Length = 256)]
-//    [MaxLength(256)]
-//    public string RequestUrl { get; set; }
-
-//    /// <summary>
-//    /// 请求类型
-//    /// </summary>
-//    [SugarColumn(ColumnDescription = "请求类型")]
-//    public RequestTypeEnum RequestType { get; set; } = RequestTypeEnum.Post;
-
-//    /// <summary>
-//    /// 请求参数
-//    /// </summary>
-//    [SugarColumn(ColumnDescription = "请求参数")]
-//    public string RequestPara { get; set; }
-
-//    /// <summary>
-//    /// Headers参数 比如{"Authorization":"userpassword"}
-//    /// </summary>
-//    [SugarColumn(ColumnDescription = "Headers参数")]
-//    public string Headers { get; set; }
-
-//    /// <summary>
-//    /// 排序
-//    /// </summary>
-//    [SugarColumn(ColumnDescription = "排序")]
-//    public int Order { get; set; } = 100;
-
-//    /// <summary>
-//    /// 备注
-//    /// </summary>
-//    [SugarColumn(ColumnDescription = "备注", Length = 128)]
-//    [MaxLength(128)]
-//    public string Remark { get; set; }
-//}

+ 1 - 1
Admin.NET/Admin.NET.Core/Entity/SysUser.cs

@@ -161,7 +161,7 @@ public class SysUser : EntityTenant
     /// 排序
     /// </summary>
     [SugarColumn(ColumnDescription = "排序")]
-    public int Order { get; set; } = 100;
+    public int OrderNo { get; set; } = 100;
 
     /// <summary>
     /// 状态

+ 6 - 6
Admin.NET/Admin.NET.Core/SeedData/SysConfigSeedData.cs

@@ -14,12 +14,12 @@ public class SysConfigSeedData : ISqlSugarEntitySeedData<SysConfig>
     {
         return new[]
         {
-            new SysConfig{ Id=252885263003800, Name="演示环境", Code="sys_demo", Value="False", SysFlag=YesNoEnum.Y, Remark="演示环境", Order=1, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysConfig{ Id=252885263003801, Name="默认密码", Code="sys_password", Value="123456", SysFlag=YesNoEnum.Y, Remark="默认密码", Order=2, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysConfig{ Id=252885263003802, Name="Token过期时间", Code="sys_token_expire", Value="10080", SysFlag=YesNoEnum.Y, Remark="Token过期时间", Order=3, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysConfig{ Id=252885263003803, Name="操作日志", Code="sys_oplog", Value="True", SysFlag=YesNoEnum.Y, Remark="开启操作日志", Order=4, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysConfig{ Id=252885263003804, Name="单点登录", Code="sys_single_login", Value="True", SysFlag=YesNoEnum.Y, Remark="开启单点登录", Order=5, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysConfig{ Id=252885263003805, Name="登录二次验证", Code="sys_second_ver", Value="True", SysFlag=YesNoEnum.Y, Remark="登录二次验证", Order=6, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysConfig{ Id=252885263003800, Name="演示环境", Code="sys_demo", Value="False", SysFlag=YesNoEnum.Y, Remark="演示环境", OrderNo=1, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysConfig{ Id=252885263003801, Name="默认密码", Code="sys_password", Value="123456", SysFlag=YesNoEnum.Y, Remark="默认密码", OrderNo=2, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysConfig{ Id=252885263003802, Name="Token过期时间", Code="sys_token_expire", Value="10080", SysFlag=YesNoEnum.Y, Remark="Token过期时间", OrderNo=3, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysConfig{ Id=252885263003803, Name="操作日志", Code="sys_oplog", Value="True", SysFlag=YesNoEnum.Y, Remark="开启操作日志", OrderNo=4, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysConfig{ Id=252885263003804, Name="单点登录", Code="sys_single_login", Value="True", SysFlag=YesNoEnum.Y, Remark="开启单点登录", OrderNo=5, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysConfig{ Id=252885263003805, Name="登录二次验证", Code="sys_second_ver", Value="True", SysFlag=YesNoEnum.Y, Remark="登录二次验证", OrderNo=6, GroupCode="Default", CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
         };
     }
 }

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

@@ -14,46 +14,46 @@ public class SysDictDataSeedData : ISqlSugarEntitySeedData<SysDictData>
     {
         return new[]
         {
-            new SysDictData{ Id=269037953100001, DictTypeId=269037954100001, Value="输入框", Code="Input", Order=100, Remark="输入框", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953100002, DictTypeId=269037954100001, Value="外键", Code="fk", Order=100, Remark="外键", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953100003, DictTypeId=269037954100001, Value="时间选择", Code="DatePicker", Order=100, Remark="时间选择", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953100004, DictTypeId=269037954100001, Value="选择器", Code="Select", Order=100, Remark="选择器", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953100005, DictTypeId=269037954100001, Value="数字输入框", Code="InputNumber", Order=100, Remark="数字输入框", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953100006, DictTypeId=269037954100001, Value="文本域", Code="InputTextArea", Order=100, Remark="文本域", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953100007, DictTypeId=269037954100001, Value="上传", Code="Upload", Order=100, Remark="上传", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953100008, DictTypeId=269037954100001, Value="树选择", Code="ApiTreeSelect", Order=100, Remark="树选择", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953100009, DictTypeId=269037954100001, Value="开关", Code="Switch", Order=100, Remark="开关", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953100010, DictTypeId=269037954100001, Value="常量选择器", Code="ConstSelector", Order=100, Remark="常量选择器", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953100001, DictTypeId=269037954100001, Value="输入框", Code="Input", OrderNo=100, Remark="输入框", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953100002, DictTypeId=269037954100001, Value="外键", Code="fk", OrderNo=100, Remark="外键", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953100003, DictTypeId=269037954100001, Value="时间选择", Code="DatePicker", OrderNo=100, Remark="时间选择", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953100004, DictTypeId=269037954100001, Value="选择器", Code="Select", OrderNo=100, Remark="选择器", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953100005, DictTypeId=269037954100001, Value="数字输入框", Code="InputNumber", OrderNo=100, Remark="数字输入框", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953100006, DictTypeId=269037954100001, Value="文本域", Code="InputTextArea", OrderNo=100, Remark="文本域", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953100007, DictTypeId=269037954100001, Value="上传", Code="Upload", OrderNo=100, Remark="上传", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953100008, DictTypeId=269037954100001, Value="树选择", Code="ApiTreeSelect", OrderNo=100, Remark="树选择", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953100009, DictTypeId=269037954100001, Value="开关", Code="Switch", OrderNo=100, Remark="开关", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953100010, DictTypeId=269037954100001, Value="常量选择器", Code="ConstSelector", OrderNo=100, Remark="常量选择器", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
 
-            new SysDictData{ Id=269037953110001, DictTypeId=269037954100002, Value="等于", Code="==", Order=1, Remark="等于", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953110002, DictTypeId=269037954100002, Value="模糊", Code="like", Order=1, Remark="模糊", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953110003, DictTypeId=269037954100002, Value="大于", Code=">", Order=1, Remark="大于", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953110004, DictTypeId=269037954100002, Value="小于", Code="<", Order=1, Remark="小于", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953110005, DictTypeId=269037954100002, Value="不等于", Code="!=", Order=1, Remark="不等于", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953110006, DictTypeId=269037954100002, Value="大于等于", Code=">=", Order=1, Remark="大于等于", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953110007, DictTypeId=269037954100002, Value="小于等于", Code="<=", Order=1, Remark="小于等于", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953110008, DictTypeId=269037954100002, Value="不为空", Code="isNotNull", Order=1, Remark="不为空", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953110009, DictTypeId=269037954100002, Value="时间范围", Code="~", Order=1, Remark="时间范围", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953110001, DictTypeId=269037954100002, Value="等于", Code="==", OrderNo=1, Remark="等于", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953110002, DictTypeId=269037954100002, Value="模糊", Code="like", OrderNo=1, Remark="模糊", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953110003, DictTypeId=269037954100002, Value="大于", Code=">", OrderNo=1, Remark="大于", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953110004, DictTypeId=269037954100002, Value="小于", Code="<", OrderNo=1, Remark="小于", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953110005, DictTypeId=269037954100002, Value="不等于", Code="!=", OrderNo=1, Remark="不等于", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953110006, DictTypeId=269037954100002, Value="大于等于", Code=">=", OrderNo=1, Remark="大于等于", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953110007, DictTypeId=269037954100002, Value="小于等于", Code="<=", OrderNo=1, Remark="小于等于", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953110008, DictTypeId=269037954100002, Value="不为空", Code="isNotNull", OrderNo=1, Remark="不为空", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953110009, DictTypeId=269037954100002, Value="时间范围", Code="~", OrderNo=1, Remark="时间范围", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
 
-            new SysDictData{ Id=269037953120001, DictTypeId=269037954100003, Value="long", Code="long", Order=1, Remark="long", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953120002, DictTypeId=269037954100003, Value="string", Code="string", Order=1, Remark="string", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953120003, DictTypeId=269037954100003, Value="DateTime", Code="DateTime", Order=1, Remark="DateTime", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953120004, DictTypeId=269037954100003, Value="bool", Code="bool", Order=1, Remark="bool", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953120005, DictTypeId=269037954100003, Value="int", Code="int", Order=1, Remark="int", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953120006, DictTypeId=269037954100003, Value="double", Code="double", Order=1, Remark="double", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953120007, DictTypeId=269037954100003, Value="float", Code="float", Order=1, Remark="float", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953120008, DictTypeId=269037954100003, Value="decimal", Code="decimal", Order=1, Remark="decimal", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953120009, DictTypeId=269037954100003, Value="Guid", Code="Guid", Order=1, Remark="Guid", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953120010, DictTypeId=269037954100003, Value="DateTimeOffset", Code="DateTimeOffset", Order=1, Remark="DateTimeOffset", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953120001, DictTypeId=269037954100003, Value="long", Code="long", OrderNo=1, Remark="long", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953120002, DictTypeId=269037954100003, Value="string", Code="string", OrderNo=1, Remark="string", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953120003, DictTypeId=269037954100003, Value="DateTime", Code="DateTime", OrderNo=1, Remark="DateTime", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953120004, DictTypeId=269037954100003, Value="bool", Code="bool", OrderNo=1, Remark="bool", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953120005, DictTypeId=269037954100003, Value="int", Code="int", OrderNo=1, Remark="int", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953120006, DictTypeId=269037954100003, Value="double", Code="double", OrderNo=1, Remark="double", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953120007, DictTypeId=269037954100003, Value="float", Code="float", OrderNo=1, Remark="float", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953120008, DictTypeId=269037954100003, Value="decimal", Code="decimal", OrderNo=1, Remark="decimal", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953120009, DictTypeId=269037954100003, Value="Guid", Code="Guid", OrderNo=1, Remark="Guid", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953120010, DictTypeId=269037954100003, Value="DateTimeOffset", Code="DateTimeOffset", OrderNo=1, Remark="DateTimeOffset", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
 
-            new SysDictData{ Id=269037953130001, DictTypeId=269037954100004, Value="下载压缩包", Code="1", Order=1, Remark="下载压缩包", Status=StatusEnum.Disable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953130002, DictTypeId=269037954100004, Value="生成到本项目", Code="2", Order=1, Remark="生成到本项目", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953130001, DictTypeId=269037954100004, Value="下载压缩包", Code="1", OrderNo=1, Remark="下载压缩包", Status=StatusEnum.Disable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953130002, DictTypeId=269037954100004, Value="生成到本项目", Code="2", OrderNo=1, Remark="生成到本项目", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
 
-            new SysDictData{ Id=269037953140001, DictTypeId=269037954200001, Value="省级", Code="省级", Order=1, Remark="省级", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953140002, DictTypeId=269037954200001, Value="市级", Code="市级", Order=2, Remark="市级", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953140003, DictTypeId=269037954200001, Value="区级", Code="区级", Order=3, Remark="区级", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953140004, DictTypeId=269037954200001, Value="县级", Code="县级", Order=4, Remark="县级", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictData{ Id=269037953140005, DictTypeId=269037954200001, Value="其他", Code="其他", Order=5, Remark="其他", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953140001, DictTypeId=269037954200001, Value="省级", Code="省级", OrderNo=1, Remark="省级", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953140002, DictTypeId=269037954200001, Value="市级", Code="市级", OrderNo=2, Remark="市级", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953140003, DictTypeId=269037954200001, Value="区级", Code="区级", OrderNo=3, Remark="区级", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953140004, DictTypeId=269037954200001, Value="县级", Code="县级", OrderNo=4, Remark="县级", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictData{ Id=269037953140005, DictTypeId=269037954200001, Value="其他", Code="其他", OrderNo=5, Remark="其他", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
         };
     }
 }

+ 4 - 4
Admin.NET/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs

@@ -14,10 +14,10 @@ public class SysDictTypeSeedData : ISqlSugarEntitySeedData<SysDictType>
     {
         return new[]
         {
-            new SysDictType{ Id=269037954100001, Name="代码生成控件类型", Code="code_gen_effect_type", Order=100, Remark="代码生成控件类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictType{ Id=269037954100002, Name="代码生成查询类型", Code="code_gen_query_type", Order=100, Remark="代码生成查询类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictType{ Id=269037954100003, Name="代码生成.NET类型", Code="code_gen_net_type", Order=100, Remark="代码生成.NET类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
-            new SysDictType{ Id=269037954100004, Name="代码生成方式", Code="code_gen_create_type", Order=100, Remark="代码生成方式", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictType{ Id=269037954100001, Name="代码生成控件类型", Code="code_gen_effect_type", OrderNo=100, Remark="代码生成控件类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictType{ Id=269037954100002, Name="代码生成查询类型", Code="code_gen_query_type", OrderNo=100, Remark="代码生成查询类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictType{ Id=269037954100003, Name="代码生成.NET类型", Code="code_gen_net_type", OrderNo=100, Remark="代码生成.NET类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
+            new SysDictType{ Id=269037954100004, Name="代码生成方式", Code="code_gen_create_type", OrderNo=100, Remark="代码生成方式", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
         };
     }
 }

+ 135 - 135
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"), Order=10 },
-            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"), Order=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"), Order=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"), Order=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"), Order=100 },
-            new SysMenu{ Id=252885263005211, Pid=252885263005210, Title="查询", Permission="sysUser:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005212, Pid=252885263005210, Title="编辑", Permission="sysUser:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005213, Pid=252885263005210, Title="增加", Permission="sysUser:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005214, Pid=252885263005210, Title="删除", Permission="sysUser:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005215, Pid=252885263005210, Title="详情", Permission="sysUser:detail", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005216, Pid=252885263005210, Title="授权角色", Permission="sysUser:grantRole", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005217, Pid=252885263005210, Title="重置密码", Permission="sysUser:resetPwd", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005218, Pid=252885263005210, Title="设置状态", Permission="sysUser:setStatus", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005219, Pid=252885263005210, Title="修改密码", Permission="sysUser:changePwd", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005220, Pid=252885263005210, Title="强制下线", Permission="sysUser:forceOffline", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=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"), Order=110 },
-            new SysMenu{ Id=252885263005231, Pid=252885263005230, Title="查询", Permission="sysRole:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005232, Pid=252885263005230, Title="编辑", Permission="sysRole:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005233, Pid=252885263005230, Title="增加", Permission="sysRole:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005234, Pid=252885263005230, Title="删除", Permission="sysRole:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005235, Pid=252885263005230, Title="授权菜单", Permission="sysRole:grantMenu", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005236, Pid=252885263005230, Title="授权数据", Permission="sysRole:grantData", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005237, Pid=252885263005230, Title="设置状态", Permission="sysRole:setStatus", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=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"), Order=130 },
-            new SysMenu{ Id=252885263005241, Pid=252885263005240, Title="查询", Permission="sysOrg:list", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005242, Pid=252885263005240, Title="编辑", Permission="sysOrg:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005243, Pid=252885263005240, Title="增加", Permission="sysOrg:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005244, Pid=252885263005240, Title="删除", Permission="sysOrg:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=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"), Order=140 },
-            new SysMenu{ Id=252885263005251, Pid=252885263005250, Title="查询", Permission="sysPos:list", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005252, Pid=252885263005250, Title="编辑", Permission="sysPos:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005253, Pid=252885263005250, Title="增加", Permission="sysPos:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005254, Pid=252885263005250, Title="删除", Permission="sysPos:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=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"), Order=150 },
-            new SysMenu{ Id=252885263005261, Pid=252885263005260, Title="修改密码", Permission="sysUser:changePwd", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005262, Pid=252885263005260, Title="更新信息", Permission="sysUser:updateBase", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005263, Pid=252885263005260, Title="电子签名", Permission="sysUser:signature", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=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"), Order=160 },
-            new SysMenu{ Id=252885263005271, Pid=252885263005270, Title="查询", Permission="sysNotice:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005272, Pid=252885263005270, Title="编辑", Permission="sysNotice:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005273, Pid=252885263005270, Title="增加", Permission="sysNotice:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005274, Pid=252885263005270, Title="删除", Permission="sysNotice:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005275, Pid=252885263005270, Title="发布", Permission="sysNotice:public", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005276, Pid=252885263005270, Title="撤回", Permission="sysNotice:cancel", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
+            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=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"), Order=170 },
-            new SysMenu{ Id=252885263005281, Pid=252885263005280, Title="查询", Permission="weChatUser:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005282, Pid=252885263005280, Title="编辑", Permission="weChatUser:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005283, Pid=252885263005280, Title="删除", Permission="weChatUser:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=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"), Order=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"), Order=100 },
-            new SysMenu{ Id=252885263005311, Pid=252885263005310, Title="查询", Permission="sysTenant:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005312, Pid=252885263005310, Title="编辑", Permission="sysTenant:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005313, Pid=252885263005310, Title="增加", Permission="sysTenant:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005314, Pid=252885263005310, Title="删除", Permission="sysTenant:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005315, Pid=252885263005310, Title="授权菜单", Permission="sysTenant:grantMenu", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005316, Pid=252885263005310, Title="重置密码", Permission="sysTenant:resetPwd", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005317, Pid=252885263005310, Title="生成库", Permission="sysTenant:createDb", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=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"), Order=120 },
-            new SysMenu{ Id=252885263005321, Pid=252885263005320, Title="查询", Permission="sysMenu:list", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005322, Pid=252885263005320, Title="编辑", Permission="sysMenu:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005323, Pid=252885263005320, Title="增加", Permission="sysMenu:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005324, Pid=252885263005320, Title="删除", Permission="sysMenu:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=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"), Order=110 },
-            new SysMenu{ Id=252885263005331, Pid=252885263005330, Title="查询", Permission="sysConfig:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005332, Pid=252885263005330, Title="编辑", Permission="sysConfig:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005333, Pid=252885263005330, Title="增加", Permission="sysConfig:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005334, Pid=252885263005330, Title="删除", Permission="sysConfig:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=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"), Order=120 },
-            new SysMenu{ Id=252885263005341, Pid=252885263005340, Title="查询", Permission="sysDictType:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005342, Pid=252885263005340, Title="编辑", Permission="sysDictType:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005343, Pid=252885263005340, Title="增加", Permission="sysDictType:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005344, Pid=252885263005340, Title="删除", Permission="sysDictType:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=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"), Order=130 },
-            new SysMenu{ Id=252885263005351, Pid=252885263005350, Title="查询", Permission="sysJob:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005352, Pid=252885263005350, Title="编辑", Permission="sysJob:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005353, Pid=252885263005350, Title="增加", Permission="sysJob:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005354, Pid=252885263005350, Title="删除", Permission="sysJob:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=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"), Order=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"), Order=150 },
-            new SysMenu{ Id=252885263005371, Pid=252885263005370, Title="查询", Permission="sysCache:keyList", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005372, Pid=252885263005370, Title="删除", Permission="sysCache:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=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"), Order=160 },
-            new SysMenu{ Id=252885263005381, Pid=252885263005380, Title="查询", Permission="sysRegion:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005382, Pid=252885263005380, Title="编辑", Permission="sysRegion:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005383, Pid=252885263005380, Title="增加", Permission="sysRegion:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005384, Pid=252885263005380, Title="删除", Permission="sysRegion:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005385, Pid=252885263005380, Title="同步", Permission="sysRegion:sync", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=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"), Order=170 },
-            new SysMenu{ Id=252885263005391, Pid=252885263005390, Title="查询", Permission="sysFile:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005392, Pid=252885263005390, Title="上传", Permission="sysFile:upload", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005393, Pid=252885263005390, Title="下载", Permission="sysFile:download", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005394, Pid=252885263005390, Title="删除", Permission="sysFile:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=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"), Order=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"), Order=100 },
-            new SysMenu{ Id=252885263005511, Pid=252885263005510, Title="查询", Permission="sysVislog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005512, Pid=252885263005510, Title="清空", Permission="sysVislog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=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"), Order=110 },
-            new SysMenu{ Id=252885263005521, Pid=252885263005520, Title="查询", Permission="sysOplog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005522, Pid=252885263005520, Title="清空", Permission="sysOplog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005523, Pid=252885263005520, Title="导出", Permission="sysOplog:export", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=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"), Order=120 },
-            new SysMenu{ Id=252885263005531, Pid=252885263005530, Title="查询", Permission="sysExlog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005532, Pid=252885263005530, Title="清空", Permission="sysExlog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005533, Pid=252885263005530, Title="导出", Permission="sysExlog:export", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=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"), Order=130 },
-            new SysMenu{ Id=252885263005541, Pid=252885263005540, Title="查询", Permission="sysDifflog:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=100 },
-            new SysMenu{ Id=252885263005542, Pid=252885263005540, Title="清空", Permission="sysDifflog:clear", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), Order=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"), Order=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"), Order=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"), Order=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"), Order=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"), Order=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"), Order=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"), Order=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"), Order=101 },
+            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 },
         };
     }
 }

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/Config/SysConfigService.cs

@@ -28,7 +28,7 @@ public class SysConfigService : IDynamicApiController, ITransient
             .WhereIF(!string.IsNullOrWhiteSpace(input.Name?.Trim()), u => u.Name.Contains(input.Name))
             .WhereIF(!string.IsNullOrWhiteSpace(input.Code?.Trim()), u => u.Code.Contains(input.Code))
             .WhereIF(!string.IsNullOrWhiteSpace(input.GroupCode?.Trim()), u => u.GroupCode.Equals(input.GroupCode))
-            .OrderBy(u => u.Order).ToPagedListAsync(input.Page, input.PageSize);
+            .OrderBy(u => u.OrderNo).ToPagedListAsync(input.Page, input.PageSize);
     }
 
     /// <summary>

+ 2 - 2
Admin.NET/Admin.NET.Core/Service/Dict/SysDictDataService.cs

@@ -28,7 +28,7 @@ public class SysDictDataService : IDynamicApiController, ITransient
             .Where(u => u.DictTypeId == input.DictTypeId)
             .WhereIF(code, u => u.Code.Contains(input.Code))
             .WhereIF(value, u => u.Code.Contains(input.Value))
-            .OrderBy(u => u.Order)
+            .OrderBy(u => u.OrderNo)
             .ToPagedListAsync(input.Page, input.PageSize);
     }
 
@@ -129,7 +129,7 @@ public class SysDictDataService : IDynamicApiController, ITransient
     {
         return await _sysDictDataRep.AsQueryable()
             .Where(u => u.DictTypeId == dictTypeId)
-            .OrderBy(u => u.Order).ToListAsync();
+            .OrderBy(u => u.OrderNo).ToListAsync();
     }
 
     /// <summary>

+ 2 - 2
Admin.NET/Admin.NET.Core/Service/Dict/SysDictTypeService.cs

@@ -29,7 +29,7 @@ public class SysDictTypeService : IDynamicApiController, ITransient
         return await _sysDictTypeRep.AsQueryable()
             .WhereIF(code, u => u.Code.Contains(input.Code))
             .WhereIF(name, u => u.Name.Contains(input.Name))
-            .OrderBy(u => u.Order)
+            .OrderBy(u => u.OrderNo)
             .ToPagedListAsync(input.Page, input.PageSize);
     }
 
@@ -40,7 +40,7 @@ public class SysDictTypeService : IDynamicApiController, ITransient
     [HttpGet("/sysDictType/list")]
     public async Task<List<SysDictType>> GetDictTypeList()
     {
-        return await _sysDictTypeRep.AsQueryable().OrderBy(u => u.Order).ToListAsync();
+        return await _sysDictTypeRep.AsQueryable().OrderBy(u => u.OrderNo).ToListAsync();
     }
 
     /// <summary>

+ 16 - 19
Admin.NET/Admin.NET.Core/Service/Menu/Dto/MenuOutput.cs

@@ -45,6 +45,21 @@ public class MenuOutput
     /// </summary>
     public string Redirect { get; set; }
 
+    /// <summary>
+    /// 排序
+    /// </summary>
+    public int OrderNo { get; set; }
+
+    /// <summary>
+    /// 状态
+    /// </summary>
+    public StatusEnum Status { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string Remark { get; set; }
+
     /// <summary>
     /// 菜单Meta
     /// </summary>
@@ -95,21 +110,6 @@ public class SysMenuMeta
     /// 是否固定
     /// </summary>
     public bool IsAffix { get; set; }
-
-    /// <summary>
-    /// 排序
-    /// </summary>
-    public int Order { get; set; }
-
-    /// <summary>
-    /// 状态
-    /// </summary>
-    public StatusEnum Status { get; set; }
-
-    /// <summary>
-    /// 备注
-    /// </summary>
-    public string Remark { get; set; }
 }
 
 /// <summary>
@@ -126,9 +126,6 @@ public class SysMenuMapper : IRegister
             .Map(t => t.Meta.IsLink, o => o.OutLink)
             .Map(t => t.Meta.IsHide, o => o.IsHide)
             .Map(t => t.Meta.IsKeepAlive, o => o.IsKeepAlive)
-            .Map(t => t.Meta.IsAffix, o => o.IsAffix)
-            .Map(t => t.Meta.Order, o => o.Order)
-            .Map(t => t.Meta.Status, o => o.Status)
-            .Map(t => t.Meta.Remark, o => o.Remark);
+            .Map(t => t.Meta.IsAffix, o => o.IsAffix);
     }
 }

+ 5 - 5
Admin.NET/Admin.NET.Core/Service/Menu/SysMenuService.cs

@@ -36,14 +36,14 @@ public class SysMenuService : IDynamicApiController, ITransient
         {
             var menuList = await _sysMenuRep.AsQueryable()
                 .Where(u => u.Type != MenuTypeEnum.Btn)
-                .OrderBy(u => u.Order).ToTreeAsync(u => u.Children, u => u.Pid, 0);
+                .OrderBy(u => u.OrderNo).ToTreeAsync(u => u.Children, u => u.Pid, 0);
             return menuList.Adapt<List<MenuOutput>>();
         }
         else
         {
             var menuIdList = await GetMenuIdList();
             var menuTree = await _sysMenuRep.AsQueryable()
-                .OrderBy(u => u.Order).ToTreeAsync(u => u.Children, u => u.Pid, 0, menuIdList.Select(d => (object)d).ToArray());
+                .OrderBy(u => u.OrderNo).ToTreeAsync(u => u.Children, u => u.Pid, 0, menuIdList.Select(d => (object)d).ToArray());
             DeleteBtnFromMenuTree(menuTree);
             return menuTree.Adapt<List<MenuOutput>>();
         }
@@ -81,13 +81,13 @@ public class SysMenuService : IDynamicApiController, ITransient
                 .WhereIF(!string.IsNullOrWhiteSpace(input.Title), u => u.Title.Contains(input.Title))
                 .WhereIF(input.Type > 0, u => u.Type == input.Type)
                 .WhereIF(menuIdList.Count > 1, u => menuIdList.Contains(u.Id))
-                .OrderBy(u => u.Order).ToListAsync();
+                .OrderBy(u => u.OrderNo).ToListAsync();
         }
 
         return _userManager.SuperAdmin ?
-            await _sysMenuRep.AsQueryable().OrderBy(u => u.Order).ToTreeAsync(u => u.Children, u => u.Pid, 0) :
+            await _sysMenuRep.AsQueryable().OrderBy(u => u.OrderNo).ToTreeAsync(u => u.Children, u => u.Pid, 0) :
             await _sysMenuRep.AsQueryable()
-                .OrderBy(u => u.Order).ToTreeAsync(u => u.Children, u => u.Pid, 0, menuIdList.Select(d => (object)d).ToArray()); // 角色菜单授权时
+                .OrderBy(u => u.OrderNo).ToTreeAsync(u => u.Children, u => u.Pid, 0, menuIdList.Select(d => (object)d).ToArray()); // 角色菜单授权时
     }
 
     /// <summary>

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/Org/SysOrgService.cs

@@ -37,7 +37,7 @@ public class SysOrgService : IDynamicApiController, ITransient
     {
         var orgIdList = await GetUserOrgIdList();
 
-        var iSugarQueryable = _sysOrgRep.AsQueryable().OrderBy(u => u.Order);
+        var iSugarQueryable = _sysOrgRep.AsQueryable().OrderBy(u => u.OrderNo);
 
         // 条件筛选可能造成无法构造树(列表数据)
         if (!string.IsNullOrWhiteSpace(input.Name) || !string.IsNullOrWhiteSpace(input.Code))

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/Pos/SysPosService.cs

@@ -27,7 +27,7 @@ public class SysPosService : IDynamicApiController, ITransient
         return await _sysPosRep.AsQueryable()
             .WhereIF(!string.IsNullOrWhiteSpace(input.Name), u => u.Name.Contains(input.Name))
             .WhereIF(!string.IsNullOrWhiteSpace(input.Code), u => u.Code.Contains(input.Code))
-            .OrderBy(u => u.Order).ToListAsync();
+            .OrderBy(u => u.OrderNo).ToListAsync();
     }
 
     /// <summary>

+ 2 - 2
Admin.NET/Admin.NET.Core/Service/Role/SysRoleService.cs

@@ -42,7 +42,7 @@ public class SysRoleService : IDynamicApiController, ITransient
         return await _sysRoleRep.AsQueryable()
             .WhereIF(!string.IsNullOrWhiteSpace(input.Name), u => u.Name.Contains(input.Name))
             .WhereIF(!string.IsNullOrWhiteSpace(input.Code), u => u.Code.Contains(input.Code))
-            .OrderBy(u => u.Order)
+            .OrderBy(u => u.OrderNo)
             .ToPagedListAsync(input.Page, input.PageSize);
     }
 
@@ -53,7 +53,7 @@ public class SysRoleService : IDynamicApiController, ITransient
     [HttpGet("/sysRole/list")]
     public async Task<List<RoleOutput>> GetRoleList()
     {
-        return await _sysRoleRep.AsQueryable().OrderBy(u => u.Order).Select<RoleOutput>().ToListAsync();
+        return await _sysRoleRep.AsQueryable().OrderBy(u => u.OrderNo).Select<RoleOutput>().ToListAsync();
     }
 
     /// <summary>

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs

@@ -72,7 +72,7 @@ public class SysTenantService : IDynamicApiController, ITransient
                 DbType = t.DbType,
                 Connection = t.Connection,
                 ConfigId = t.ConfigId,
-                Order = t.Order,
+                OrderNo = t.OrderNo,
                 Remark = t.Remark,
                 Status = t.Status,
             })

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/User/SysUserService.cs

@@ -45,7 +45,7 @@ public class SysUserService : IDynamicApiController, ITransient
             .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.Order)
+            .OrderBy(u => u.OrderNo)
             .ToPagedListAsync(input.Page, input.PageSize);
     }
 

+ 1 - 1
Web/.eslintrc.js

@@ -70,7 +70,7 @@ module.exports = {
 		'no-unused-vars': 'error',
 		'no-v-model-argument': 'off',
 		'no-case-declarations': 'off',
-		'no-console': 'error',
+		'no-console': 'off',
 		'no-redeclare': 'off',
 	},
 };

+ 0 - 89
Web/src/api-services/apis/sys-role-api.ts

@@ -20,7 +20,6 @@ import { AddRoleInput } from '../models';
 import { AdminResultInt32 } from '../models';
 import { AdminResultListInt64 } from '../models';
 import { AdminResultListRoleOutput } from '../models';
-import { AdminResultListSysMenu } from '../models';
 import { AdminResultSqlSugarPagedListSysRole } from '../models';
 import { DeleteRoleInput } from '../models';
 import { RoleInput } from '../models';
@@ -284,56 +283,6 @@ export const SysRoleApiAxiosParamCreator = function (configuration?: Configurati
                 options: localVarRequestOptions,
             };
         },
-        /**
-         * 
-         * @summary 根据角色Id获取菜单树(Antd)
-         * @param {number} id 主键Id
-         * @param {StatusEnum} [status] 状态
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        sysRoleOwnMenuTreeGet: async (id: number, status?: StatusEnum, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'id' is not null or undefined
-            if (id === null || id === undefined) {
-                throw new RequiredError('id','Required parameter id was null or undefined when calling sysRoleOwnMenuTreeGet.');
-            }
-            const localVarPath = `/sysRole/ownMenuTree`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-            const localVarRequestOptions :AxiosRequestConfig = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication Bearer required
-
-            if (status !== undefined) {
-                localVarQueryParameter['Status'] = status;
-            }
-
-            if (id !== undefined) {
-                localVarQueryParameter['Id'] = id;
-            }
-
-            const query = new URLSearchParams(localVarUrlObj.search);
-            for (const key in localVarQueryParameter) {
-                query.set(key, localVarQueryParameter[key]);
-            }
-            for (const key in options.params) {
-                query.set(key, options.params[key]);
-            }
-            localVarUrlObj.search = (new URLSearchParams(query)).toString();
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
-                options: localVarRequestOptions,
-            };
-        },
         /**
          * 
          * @summary 根据角色Id获取机构Id集合
@@ -630,21 +579,6 @@ export const SysRoleApiFp = function(configuration?: Configuration) {
                 return axios.request(axiosRequestArgs);
             };
         },
-        /**
-         * 
-         * @summary 根据角色Id获取菜单树(Antd)
-         * @param {number} id 主键Id
-         * @param {StatusEnum} [status] 状态
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async sysRoleOwnMenuTreeGet(id: number, status?: StatusEnum, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListSysMenu>>> {
-            const localVarAxiosArgs = await SysRoleApiAxiosParamCreator(configuration).sysRoleOwnMenuTreeGet(id, status, options);
-            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
-                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
-                return axios.request(axiosRequestArgs);
-            };
-        },
         /**
          * 
          * @summary 根据角色Id获取机构Id集合
@@ -777,17 +711,6 @@ export const SysRoleApiFactory = function (configuration?: Configuration, basePa
         async sysRoleOwnMenuListGet(id: number, status?: StatusEnum, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListInt64>> {
             return SysRoleApiFp(configuration).sysRoleOwnMenuListGet(id, status, options).then((request) => request(axios, basePath));
         },
-        /**
-         * 
-         * @summary 根据角色Id获取菜单树(Antd)
-         * @param {number} id 主键Id
-         * @param {StatusEnum} [status] 状态
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async sysRoleOwnMenuTreeGet(id: number, status?: StatusEnum, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListSysMenu>> {
-            return SysRoleApiFp(configuration).sysRoleOwnMenuTreeGet(id, status, options).then((request) => request(axios, basePath));
-        },
         /**
          * 
          * @summary 根据角色Id获取机构Id集合
@@ -911,18 +834,6 @@ export class SysRoleApi extends BaseAPI {
     public async sysRoleOwnMenuListGet(id: number, status?: StatusEnum, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListInt64>> {
         return SysRoleApiFp(this.configuration).sysRoleOwnMenuListGet(id, status, options).then((request) => request(this.axios, this.basePath));
     }
-    /**
-     * 
-     * @summary 根据角色Id获取菜单树(Antd)
-     * @param {number} id 主键Id
-     * @param {StatusEnum} [status] 状态
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof SysRoleApi
-     */
-    public async sysRoleOwnMenuTreeGet(id: number, status?: StatusEnum, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListSysMenu>> {
-        return SysRoleApiFp(this.configuration).sysRoleOwnMenuTreeGet(id, status, options).then((request) => request(this.axios, this.basePath));
-    }
     /**
      * 
      * @summary 根据角色Id获取机构Id集合

+ 4 - 81
Web/src/api-services/apis/sys-tenant-api.ts

@@ -19,7 +19,6 @@ import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } fr
 import { AddTenantInput } from '../models';
 import { AdminResultInt32 } from '../models';
 import { AdminResultListInt64 } from '../models';
-import { AdminResultListSysMenu } from '../models';
 import { AdminResultSqlSugarPagedListTenantOutput } from '../models';
 import { DeleteTenantInput } from '../models';
 import { RoleMenuInput } from '../models';
@@ -198,7 +197,7 @@ export const SysTenantApiAxiosParamCreator = function (configuration?: Configura
         },
         /**
          * 
-         * @summary 获取租户管理员角色拥有菜单
+         * @summary 获取租户管理员角色拥有菜单Id集合
          * @param {number} [userId] 用户Id
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
@@ -237,47 +236,6 @@ export const SysTenantApiAxiosParamCreator = function (configuration?: Configura
                 options: localVarRequestOptions,
             };
         },
-        /**
-         * 
-         * @summary 获取租户管理员角色拥有菜单树
-         * @param {number} [userId] 用户Id
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        sysTenantOwnMenuTreeGet: async (userId?: number, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/sysTenant/ownMenuTree`;
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-            const localVarRequestOptions :AxiosRequestConfig = { method: 'GET', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication Bearer required
-
-            if (userId !== undefined) {
-                localVarQueryParameter['UserId'] = userId;
-            }
-
-            const query = new URLSearchParams(localVarUrlObj.search);
-            for (const key in localVarQueryParameter) {
-                query.set(key, localVarQueryParameter[key]);
-            }
-            for (const key in options.params) {
-                query.set(key, options.params[key]);
-            }
-            localVarUrlObj.search = (new URLSearchParams(query)).toString();
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
-                options: localVarRequestOptions,
-            };
-        },
         /**
          * 
          * @summary 获取租户分页列表
@@ -539,7 +497,7 @@ export const SysTenantApiFp = function(configuration?: Configuration) {
         },
         /**
          * 
-         * @summary 获取租户管理员角色拥有菜单
+         * @summary 获取租户管理员角色拥有菜单Id集合
          * @param {number} [userId] 用户Id
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
@@ -551,20 +509,6 @@ export const SysTenantApiFp = function(configuration?: Configuration) {
                 return axios.request(axiosRequestArgs);
             };
         },
-        /**
-         * 
-         * @summary 获取租户管理员角色拥有菜单树
-         * @param {number} [userId] 用户Id
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async sysTenantOwnMenuTreeGet(userId?: number, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListSysMenu>>> {
-            const localVarAxiosArgs = await SysTenantApiAxiosParamCreator(configuration).sysTenantOwnMenuTreeGet(userId, options);
-            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
-                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
-                return axios.request(axiosRequestArgs);
-            };
-        },
         /**
          * 
          * @summary 获取租户分页列表
@@ -678,7 +622,7 @@ export const SysTenantApiFactory = function (configuration?: Configuration, base
         },
         /**
          * 
-         * @summary 获取租户管理员角色拥有菜单
+         * @summary 获取租户管理员角色拥有菜单Id集合
          * @param {number} [userId] 用户Id
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
@@ -686,16 +630,6 @@ export const SysTenantApiFactory = function (configuration?: Configuration, base
         async sysTenantOwnMenuListGet(userId?: number, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListInt64>> {
             return SysTenantApiFp(configuration).sysTenantOwnMenuListGet(userId, options).then((request) => request(axios, basePath));
         },
-        /**
-         * 
-         * @summary 获取租户管理员角色拥有菜单树
-         * @param {number} [userId] 用户Id
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async sysTenantOwnMenuTreeGet(userId?: number, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListSysMenu>> {
-            return SysTenantApiFp(configuration).sysTenantOwnMenuTreeGet(userId, options).then((request) => request(axios, basePath));
-        },
         /**
          * 
          * @summary 获取租户分页列表
@@ -798,7 +732,7 @@ export class SysTenantApi extends BaseAPI {
     }
     /**
      * 
-     * @summary 获取租户管理员角色拥有菜单
+     * @summary 获取租户管理员角色拥有菜单Id集合
      * @param {number} [userId] 用户Id
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
@@ -807,17 +741,6 @@ export class SysTenantApi extends BaseAPI {
     public async sysTenantOwnMenuListGet(userId?: number, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListInt64>> {
         return SysTenantApiFp(this.configuration).sysTenantOwnMenuListGet(userId, options).then((request) => request(this.axios, this.basePath));
     }
-    /**
-     * 
-     * @summary 获取租户管理员角色拥有菜单树
-     * @param {number} [userId] 用户Id
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof SysTenantApi
-     */
-    public async sysTenantOwnMenuTreeGet(userId?: number, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListSysMenu>> {
-        return SysTenantApiFp(this.configuration).sysTenantOwnMenuTreeGet(userId, options).then((request) => request(this.axios, this.basePath));
-    }
     /**
      * 
      * @summary 获取租户分页列表

+ 1 - 1
Web/src/api-services/models/add-config-input.ts

@@ -89,7 +89,7 @@ export interface AddConfigInput {
      * @type {number}
      * @memberof AddConfigInput
      */
-    order?: number;
+    orderNo?: number;
     /**
      * 备注
      * @type {string}

+ 1 - 1
Web/src/api-services/models/add-dict-data-input.ts

@@ -84,7 +84,7 @@ export interface AddDictDataInput {
      * @type {number}
      * @memberof AddDictDataInput
      */
-    order?: number;
+    orderNo?: number;
     /**
      * 备注
      * @type {string}

+ 1 - 1
Web/src/api-services/models/add-dict-type-input.ts

@@ -71,7 +71,7 @@ export interface AddDictTypeInput {
      * @type {number}
      * @memberof AddDictTypeInput
      */
-    order?: number;
+    orderNo?: number;
     /**
      * 备注
      * @type {string}

+ 1 - 1
Web/src/api-services/models/add-menu-input.ts

@@ -139,7 +139,7 @@ export interface AddMenuInput {
      * @type {number}
      * @memberof AddMenuInput
      */
-    order?: number;
+    orderNo?: number;
     /**
      * 
      * @type {StatusEnum}

+ 1 - 1
Web/src/api-services/models/add-org-input.ts

@@ -78,7 +78,7 @@ export interface AddOrgInput {
      * @type {number}
      * @memberof AddOrgInput
      */
-    order?: number;
+    orderNo?: number;
     /**
      * 备注
      * @type {string}

+ 1 - 1
Web/src/api-services/models/add-pos-input.ts

@@ -71,7 +71,7 @@ export interface AddPosInput {
      * @type {number}
      * @memberof AddPosInput
      */
-    order?: number;
+    orderNo?: number;
     /**
      * 备注
      * @type {string}

+ 1 - 1
Web/src/api-services/models/add-region-input.ts

@@ -89,7 +89,7 @@ export interface AddRegionInput {
      * @type {number}
      * @memberof AddRegionInput
      */
-    order?: number;
+    orderNo?: number;
     /**
      * 备注
      * @type {string}

+ 1 - 1
Web/src/api-services/models/add-role-input.ts

@@ -72,7 +72,7 @@ export interface AddRoleInput {
      * @type {number}
      * @memberof AddRoleInput
      */
-    order?: number;
+    orderNo?: number;
     /**
      * 
      * @type {DataScopeEnum}

+ 1 - 1
Web/src/api-services/models/add-tenant-input.ts

@@ -103,7 +103,7 @@ export interface AddTenantInput {
      * @type {number}
      * @memberof AddTenantInput
      */
-    order?: number;
+    orderNo?: number;
     /**
      * 备注
      * @type {string}

+ 1 - 1
Web/src/api-services/models/add-user-input.ts

@@ -186,7 +186,7 @@ export interface AddUserInput {
      * @type {number}
      * @memberof AddUserInput
      */
-    order?: number;
+    orderNo?: number;
     /**
      * 
      * @type {StatusEnum}

+ 19 - 0
Web/src/api-services/models/menu-output.ts

@@ -13,6 +13,7 @@
  */
 import { MenuOutput } from './menu-output';
 import { MenuTypeEnum } from './menu-type-enum';
+import { StatusEnum } from './status-enum';
 import { SysMenuMeta } from './sys-menu-meta';
 /**
  * 系统菜单返回结果
@@ -68,6 +69,24 @@ export interface MenuOutput {
      * @memberof MenuOutput
      */
     redirect?: string | null;
+    /**
+     * 排序
+     * @type {number}
+     * @memberof MenuOutput
+     */
+    orderNo?: number;
+    /**
+     * 
+     * @type {StatusEnum}
+     * @memberof MenuOutput
+     */
+    status?: StatusEnum;
+    /**
+     * 备注
+     * @type {string}
+     * @memberof MenuOutput
+     */
+    remark?: string | null;
     /**
      * 
      * @type {SysMenuMeta}

+ 1 - 1
Web/src/api-services/models/sys-config.ts

@@ -89,7 +89,7 @@ export interface SysConfig {
      * @type {number}
      * @memberof SysConfig
      */
-    order?: number;
+    orderNo?: number;
     /**
      * 备注
      * @type {string}

+ 1 - 1
Web/src/api-services/models/sys-dict-data.ts

@@ -84,7 +84,7 @@ export interface SysDictData {
      * @type {number}
      * @memberof SysDictData
      */
-    order?: number;
+    orderNo?: number;
     /**
      * 备注
      * @type {string}

+ 1 - 1
Web/src/api-services/models/sys-dict-type.ts

@@ -71,7 +71,7 @@ export interface SysDictType {
      * @type {number}
      * @memberof SysDictType
      */
-    order?: number;
+    orderNo?: number;
     /**
      * 备注
      * @type {string}

+ 0 - 19
Web/src/api-services/models/sys-menu-meta.ts

@@ -11,7 +11,6 @@
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
-import { StatusEnum } from './status-enum';
 /**
  * 菜单Meta配置
  * @export
@@ -60,22 +59,4 @@ export interface SysMenuMeta {
      * @memberof SysMenuMeta
      */
     isAffix?: boolean;
-    /**
-     * 排序
-     * @type {number}
-     * @memberof SysMenuMeta
-     */
-    order?: number;
-    /**
-     * 
-     * @type {StatusEnum}
-     * @memberof SysMenuMeta
-     */
-    status?: StatusEnum;
-    /**
-     * 备注
-     * @type {string}
-     * @memberof SysMenuMeta
-     */
-    remark?: string | null;
 }

+ 1 - 1
Web/src/api-services/models/sys-menu.ts

@@ -145,7 +145,7 @@ export interface SysMenu {
      * @type {number}
      * @memberof SysMenu
      */
-    order?: number;
+    orderNo?: number;
     /**
      * 
      * @type {StatusEnum}

+ 1 - 1
Web/src/api-services/models/sys-org.ts

@@ -84,7 +84,7 @@ export interface SysOrg {
      * @type {number}
      * @memberof SysOrg
      */
-    order?: number;
+    orderNo?: number;
     /**
      * 备注
      * @type {string}

+ 1 - 1
Web/src/api-services/models/sys-pos.ts

@@ -77,7 +77,7 @@ export interface SysPos {
      * @type {number}
      * @memberof SysPos
      */
-    order?: number;
+    orderNo?: number;
     /**
      * 备注
      * @type {string}

+ 1 - 1
Web/src/api-services/models/sys-region.ts

@@ -95,7 +95,7 @@ export interface SysRegion {
      * @type {number}
      * @memberof SysRegion
      */
-    order?: number;
+    orderNo?: number;
     /**
      * 备注
      * @type {string}

+ 1 - 1
Web/src/api-services/models/sys-role.ts

@@ -78,7 +78,7 @@ export interface SysRole {
      * @type {number}
      * @memberof SysRole
      */
-    order?: number;
+    orderNo?: number;
     /**
      * 
      * @type {DataScopeEnum}

+ 1 - 1
Web/src/api-services/models/sys-user.ts

@@ -197,7 +197,7 @@ export interface SysUser {
      * @type {number}
      * @memberof SysUser
      */
-    order?: number;
+    orderNo?: number;
     /**
      * 
      * @type {StatusEnum}

+ 1 - 1
Web/src/api-services/models/tenant-output.ts

@@ -103,7 +103,7 @@ export interface TenantOutput {
      * @type {number}
      * @memberof TenantOutput
      */
-    order?: number;
+    orderNo?: number;
     /**
      * 备注
      * @type {string}

+ 1 - 1
Web/src/api-services/models/update-config-input.ts

@@ -89,7 +89,7 @@ export interface UpdateConfigInput {
      * @type {number}
      * @memberof UpdateConfigInput
      */
-    order?: number;
+    orderNo?: number;
     /**
      * 备注
      * @type {string}

+ 1 - 1
Web/src/api-services/models/update-dict-data-input.ts

@@ -84,7 +84,7 @@ export interface UpdateDictDataInput {
      * @type {number}
      * @memberof UpdateDictDataInput
      */
-    order?: number;
+    orderNo?: number;
     /**
      * 备注
      * @type {string}

+ 1 - 1
Web/src/api-services/models/update-dict-type-input.ts

@@ -71,7 +71,7 @@ export interface UpdateDictTypeInput {
      * @type {number}
      * @memberof UpdateDictTypeInput
      */
-    order?: number;
+    orderNo?: number;
     /**
      * 备注
      * @type {string}

+ 1 - 1
Web/src/api-services/models/update-menu-input.ts

@@ -139,7 +139,7 @@ export interface UpdateMenuInput {
      * @type {number}
      * @memberof UpdateMenuInput
      */
-    order?: number;
+    orderNo?: number;
     /**
      * 
      * @type {StatusEnum}

+ 1 - 1
Web/src/api-services/models/update-org-input.ts

@@ -78,7 +78,7 @@ export interface UpdateOrgInput {
      * @type {number}
      * @memberof UpdateOrgInput
      */
-    order?: number;
+    orderNo?: number;
     /**
      * 备注
      * @type {string}

+ 1 - 1
Web/src/api-services/models/update-pos-input.ts

@@ -71,7 +71,7 @@ export interface UpdatePosInput {
      * @type {number}
      * @memberof UpdatePosInput
      */
-    order?: number;
+    orderNo?: number;
     /**
      * 备注
      * @type {string}

+ 1 - 1
Web/src/api-services/models/update-region-input.ts

@@ -89,7 +89,7 @@ export interface UpdateRegionInput {
      * @type {number}
      * @memberof UpdateRegionInput
      */
-    order?: number;
+    orderNo?: number;
     /**
      * 备注
      * @type {string}

+ 1 - 1
Web/src/api-services/models/update-role-input.ts

@@ -72,7 +72,7 @@ export interface UpdateRoleInput {
      * @type {number}
      * @memberof UpdateRoleInput
      */
-    order?: number;
+    orderNo?: number;
     /**
      * 
      * @type {DataScopeEnum}

+ 1 - 1
Web/src/api-services/models/update-tenant-input.ts

@@ -103,7 +103,7 @@ export interface UpdateTenantInput {
      * @type {number}
      * @memberof UpdateTenantInput
      */
-    order?: number;
+    orderNo?: number;
     /**
      * 备注
      * @type {string}

+ 1 - 1
Web/src/api-services/models/update-user-input.ts

@@ -186,7 +186,7 @@ export interface UpdateUserInput {
      * @type {number}
      * @memberof UpdateUserInput
      */
-    order?: number;
+    orderNo?: number;
     /**
      * 
      * @type {StatusEnum}

+ 1 - 1
Web/src/views/system/config/component/editConfig.vue

@@ -42,7 +42,7 @@
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="排序">
-							<el-input-number v-model="ruleForm.order" placeholder="排序" class="w100" />
+							<el-input-number v-model="ruleForm.orderNo" placeholder="排序" class="w100" />
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">

+ 1 - 1
Web/src/views/system/config/index.vue

@@ -32,7 +32,7 @@
 					</template>
 				</el-table-column>
 				<el-table-column prop="groupCode" label="分组编码" show-overflow-tooltip />
-				<el-table-column prop="order" label="排序" width="70" align="center" show-overflow-tooltip />
+				<el-table-column prop="orderNo" label="排序" width="70" align="center" show-overflow-tooltip />
 				<el-table-column prop="createTime" label="修改时间" align="center" show-overflow-tooltip />
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
 				<el-table-column label="操作" width="140" fixed="right" align="center" show-overflow-tooltip>

+ 1 - 1
Web/src/views/system/dict/component/dictDataDialog.vue

@@ -34,7 +34,7 @@
 							<el-tag type="danger" v-else>禁用</el-tag>
 						</template>
 					</el-table-column>
-					<el-table-column prop="order" label="排序" width="70" align="center" show-overflow-tooltip />
+					<el-table-column prop="orderNo" label="排序" width="70" align="center" show-overflow-tooltip />
 					<el-table-column prop="createTime" label="修改时间" align="center" show-overflow-tooltip />
 					<el-table-column prop="remark" label="备注" show-overflow-tooltip />
 					<el-table-column label="操作" width="140" fixed="right" align="center" show-overflow-tooltip>

+ 1 - 1
Web/src/views/system/dict/component/editDictData.vue

@@ -29,7 +29,7 @@
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="排序">
-							<el-input-number v-model="ruleForm.order" placeholder="排序" class="w100" />
+							<el-input-number v-model="ruleForm.orderNo" placeholder="排序" class="w100" />
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">

+ 1 - 1
Web/src/views/system/dict/component/editDictType.vue

@@ -29,7 +29,7 @@
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="排序">
-							<el-input-number v-model="ruleForm.order" placeholder="排序" class="w100" />
+							<el-input-number v-model="ruleForm.orderNo" placeholder="排序" class="w100" />
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">

+ 1 - 1
Web/src/views/system/dict/index.vue

@@ -27,7 +27,7 @@
 						<el-tag type="danger" v-else>禁用</el-tag>
 					</template>
 				</el-table-column>
-				<el-table-column prop="order" label="排序" width="70" align="center" show-overflow-tooltip />
+				<el-table-column prop="orderNo" label="排序" width="70" align="center" show-overflow-tooltip />
 				<el-table-column prop="createTime" label="修改时间" align="center" show-overflow-tooltip />
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
 				<el-table-column label="操作" width="210" fixed="right" align="center" show-overflow-tooltip>

+ 2 - 2
Web/src/views/system/menu/component/editMenu.vue

@@ -73,7 +73,7 @@
 						</el-col>
 						<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 							<el-form-item label="菜单排序">
-								<el-input-number v-model="ruleForm.order" placeholder="排序" class="w100" />
+								<el-input-number v-model="ruleForm.orderNo" placeholder="排序" class="w100" />
 							</el-form-item>
 						</el-col>
 						<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
@@ -117,7 +117,7 @@
 						</el-col>
 						<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 							<el-form-item label="菜单排序">
-								<el-input-number v-model="ruleForm.order" placeholder="排序" class="w100" />
+								<el-input-number v-model="ruleForm.orderNo" placeholder="排序" class="w100" />
 							</el-form-item>
 						</el-col>
 					</template>

+ 1 - 1
Web/src/views/system/menu/index.vue

@@ -38,7 +38,7 @@
 				<el-table-column prop="path" label="路由路径" show-overflow-tooltip />
 				<el-table-column prop="component" label="组件路径" show-overflow-tooltip />
 				<el-table-column prop="permission" label="权限标识" show-overflow-tooltip />
-				<el-table-column prop="order" label="排序" width="70" align="center" show-overflow-tooltip />
+				<el-table-column prop="orderNo" label="排序" width="70" align="center" show-overflow-tooltip />
 				<el-table-column label="状态" width="80" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-tag type="success" v-if="scope.row.status === 1">启用</el-tag>

+ 1 - 2
Web/src/views/system/onlineUser/signalR.ts

@@ -7,8 +7,7 @@ const connection = new SignalR.HubConnectionBuilder()
 	.configureLogging(SignalR.LogLevel.Information)
 	.withUrl(`${import.meta.env.VITE_API_URL}/hubs/onlineUser?access_token=${getToken()}`)
 	.withAutomaticReconnect({
-		nextRetryDelayInMilliseconds: (a) => {
-			console.log(a);
+		nextRetryDelayInMilliseconds: () => {
 			return 5000; // 每5秒重连一次
 		},
 	})

+ 1 - 1
Web/src/views/system/org/component/editOrg.vue

@@ -31,7 +31,7 @@
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="排序">
-							<el-input-number v-model="ruleForm.order" placeholder="排序" class="w100" />
+							<el-input-number v-model="ruleForm.orderNo" placeholder="排序" class="w100" />
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">

+ 1 - 1
Web/src/views/system/org/index.vue

@@ -26,7 +26,7 @@
 					<el-table :data="orgData" style="width: 100%" v-loading="loading" row-key="id" default-expand-all :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" border>
 						<el-table-column prop="name" label="机构名称" show-overflow-tooltip />
 						<el-table-column prop="code" label="机构编码" show-overflow-tooltip />
-						<el-table-column prop="order" label="排序" width="70" align="center" show-overflow-tooltip />
+						<el-table-column prop="orderNo" label="排序" width="70" align="center" show-overflow-tooltip />
 						<el-table-column label="状态" width="70" align="center" show-overflow-tooltip>
 							<template #default="scope">
 								<el-tag type="success" v-if="scope.row.status === 1">启用</el-tag>

+ 1 - 1
Web/src/views/system/pos/component/editPos.vue

@@ -21,7 +21,7 @@
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="排序">
-							<el-input-number v-model="ruleForm.order" placeholder="排序" class="w100" />
+							<el-input-number v-model="ruleForm.orderNo" placeholder="排序" class="w100" />
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">

+ 1 - 1
Web/src/views/system/pos/index.vue

@@ -21,7 +21,7 @@
 				<el-table-column type="index" label="序号" width="55" align="center" />
 				<el-table-column prop="name" label="职位名称" show-overflow-tooltip />
 				<el-table-column prop="code" label="职位编码" show-overflow-tooltip />
-				<el-table-column prop="order" label="排序" width="70" align="center" show-overflow-tooltip />
+				<el-table-column prop="orderNo" label="排序" width="70" align="center" show-overflow-tooltip />
 				<el-table-column label="状态" width="70" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-tag type="success" v-if="scope.row.status === 1">启用</el-tag>

+ 1 - 1
Web/src/views/system/region/component/editRegion.vue

@@ -43,7 +43,7 @@
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="排序">
-							<el-input-number v-model="ruleForm.order" placeholder="排序" class="w100" />
+							<el-input-number v-model="ruleForm.orderNo" placeholder="排序" class="w100" />
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">

+ 1 - 1
Web/src/views/system/region/index.vue

@@ -28,7 +28,7 @@
 						<el-table-column prop="name" label="行政名称" show-overflow-tooltip />
 						<el-table-column prop="code" label="行政代码" show-overflow-tooltip />
 						<el-table-column prop="cityCode" label="区号" show-overflow-tooltip />
-						<el-table-column prop="order" label="排序" width="70" align="center" show-overflow-tooltip />
+						<el-table-column prop="orderNo" label="排序" width="70" align="center" show-overflow-tooltip />
 						<el-table-column prop="remark" label="备注" show-overflow-tooltip />
 						<el-table-column label="操作" width="140" fixed="right" align="center" show-overflow-tooltip>
 							<template #default="scope">

+ 1 - 1
Web/src/views/system/role/component/editRole.vue

@@ -21,7 +21,7 @@
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="排序">
-							<el-input-number v-model="ruleForm.order" placeholder="排序" class="w100" />
+							<el-input-number v-model="ruleForm.orderNo" placeholder="排序" class="w100" />
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">

+ 1 - 1
Web/src/views/system/role/index.vue

@@ -30,7 +30,7 @@
 						<el-tag effect="plain" v-else-if="scope.row.dataScope === 5">自定义数据</el-tag>
 					</template>
 				</el-table-column>
-				<el-table-column prop="order" label="排序" width="70" align="center" show-overflow-tooltip />
+				<el-table-column prop="orderNo" label="排序" width="70" align="center" show-overflow-tooltip />
 				<el-table-column label="状态" width="70" align="center" show-overflow-tooltip>
 					<template #default="scope">
 						<el-tag type="success" v-if="scope.row.status === 1">启用</el-tag>

+ 1 - 1
Web/src/views/system/tenant/component/editTenant.vue

@@ -39,7 +39,7 @@
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="排序">
-							<el-input-number v-model="ruleForm.order" placeholder="排序" class="w100" />
+							<el-input-number v-model="ruleForm.orderNo" placeholder="排序" class="w100" />
 						</el-form-item>
 					</el-col>
 					<!-- <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">

+ 1 - 1
Web/src/views/system/tenant/index.vue

@@ -58,7 +58,7 @@
 				</el-table-column>
 				<!-- <el-table-column prop="configId" label="数据库标识" show-overflow-tooltip /> -->
 				<el-table-column prop="connection" label="数据库连接" width="300" show-overflow-tooltip />
-				<el-table-column prop="order" label="排序" width="70" align="center" show-overflow-tooltip />
+				<el-table-column prop="orderNo" label="排序" width="70" align="center" show-overflow-tooltip />
 				<el-table-column prop="createTime" label="修改时间" width="160" align="center" show-overflow-tooltip />
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
 				<el-table-column label="操作" width="180" fixed="right" align="center" show-overflow-tooltip>

+ 1 - 1
Web/src/views/system/user/component/editUser.vue

@@ -53,7 +53,7 @@
 							</el-col>
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb5">
 								<el-form-item label="排序">
-									<el-input-number v-model="ruleForm.order" placeholder="排序" class="w100" />
+									<el-input-number v-model="ruleForm.orderNo" placeholder="排序" class="w100" />
 								</el-form-item>
 							</el-col>
 							<el-divider border-style="dashed" content-position="center">

+ 1 - 1
Web/src/views/system/user/index.vue

@@ -53,7 +53,7 @@
 								<el-switch v-model="scope.row.status" :active-value="1" :inactive-value="2" size="small" @change="changeStatus(scope.row)" v-auth="'sysUser:setStatus'" />
 							</template>
 						</el-table-column>
-						<el-table-column prop="order" label="排序" width="70" align="center" show-overflow-tooltip />
+						<el-table-column prop="orderNo" label="排序" width="70" align="center" show-overflow-tooltip />
 						<el-table-column prop="createTime" label="修改时间" width="160" show-overflow-tooltip />
 						<el-table-column prop="remark" label="备注" show-overflow-tooltip />
 						<el-table-column label="操作" width="110" align="center" fixed="right" show-overflow-tooltip>