Merge branch 'master' into net6.0

2022-05-25 09:42:01 +08:00
parent 82a60439a9 bdf46a6036
commit e527e2fa59
9 changed files with 130 additions and 81 deletions
--- a/ZR.Model/System/Dto/MenuDto.cs
+++ b/ZR.Model/System/Dto/MenuDto.cs
@@ -80,6 +80,7 @@ namespace ZR.Model.System.Dto
        public string Visible { get; set; }
        public string Status { get; set; }
        public string MenuTypeIds { get; set; } = string.Empty;
+        public int? ParentId { get; set; }
        public string[] MenuTypeIdArr
        {
            get