merge from 2023-03-14

This commit is contained in:
2023-03-24 09:37:07 +08:00
parent f95ef4cf73
commit 3de92dab06
57 changed files with 1538 additions and 528 deletions

View File

@@ -222,6 +222,18 @@ public enum ErrorCode
[ErrorCodeItemMetadata("登录票据已失效")]
D1035,
/// <summary>
/// 主系统不允许禁用.
/// </summary>
[ErrorCodeItemMetadata("主系统不允许禁用")]
D1036,
/// <summary>
/// 主系统不允许更改应用编码.
/// </summary>
[ErrorCodeItemMetadata("主系统不允许更改应用编码")]
D1037,
#endregion
#region 2
@@ -504,6 +516,12 @@ public enum ErrorCode
[ErrorCodeItemMetadata("当前导入菜单为Web端菜单请在对应模块下导入")]
D4013,
/// <summary>
/// 该系统已被禁用
/// </summary>
[ErrorCodeItemMetadata("切换失败,当前系统已被管理员禁用")]
D4014,
#endregion
#region 5