Merge branch 'master' into net6.0

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

ZR.Model/System/SysMenu.cs

@@ -21,12 +21,6 @@ namespace ZR.Model.System
         /// </summary>
         public string MenuName { get; set; }
 
-        /// <summary>
-        /// 父菜单名称
-        /// </summary>
-        [SqlSugar.SugarColumn(IsIgnore = true)]
-        public string parentName { get; set; }
-
         /// <summary>
         /// 父菜单ID
         /// </summary>
@@ -90,5 +84,21 @@ namespace ZR.Model.System
         /// </summary>
         [SugarColumn(IsIgnore = true)]
         public List<SysMenu> children { get; set; } = new List<SysMenu>();
+        /// <summary>
+        /// 子菜单个数
+        /// </summary>
+        [SugarColumn(IsIgnore = true)]
+        public int SubNum { get; set; }
+        /// <summary>
+        /// 是否包含子节点，前端用
+        /// </summary>
+        [SugarColumn(IsIgnore = true)]
+        public bool HasChildren
+        {
+            get
+            {
+                return SubNum > 0 || children.Count > 0;
+            }
+        }
     }
 }