Merge branch 'master' into net6.0

ZR.Model/System/Article.cs

@@ -8,15 +8,15 @@ namespace ZR.Model.System
     /// <summary>
     /// 文章表
     /// </summary>
-    [SqlSugar.SugarTable("article")]
+    [SugarTable("article")]
     [Tenant("0")]
     public class Article
     {
-        [SqlSugar.SugarColumn(IsIdentity = true, IsPrimaryKey = true)]
+        [SugarColumn(IsIdentity = true, IsPrimaryKey = true)]
         public int Cid { get; set; }
         public string Title { get; set; }
         public DateTime? CreateTime { get; set; }
-        [SqlSugar.SugarColumn(IsOnlyIgnoreInsert = true)]
+        [SugarColumn(IsOnlyIgnoreInsert = true)]
         public DateTime UpdateTime { get; set; }
         /// <summary>
         /// 文章内容
@@ -44,6 +44,6 @@ namespace ZR.Model.System
         /// </summary>
         public string Tags { get; set; }
         public int Hits { get; set; }
-        public int Category_id { get; set; }
+        public int Category_Id { get; set; }
     }
 }

ZR.Model/System/Dto/GenTableDto.cs

@@ -22,6 +22,7 @@ namespace ZR.Model.System.Dto
         public string GenType { get; set; }
         public string GenPath { get; set; }
         public string PermissionPrefix { get; set; }
+        public string Remark { get; set; }
         /// <summary>
         /// 额外参数
         /// </summary>

ZR.Model/System/Dto/MenuDto.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Text;
 
 namespace ZR.Model.System.Dto
@@ -7,18 +8,65 @@ namespace ZR.Model.System.Dto
     public class MenuDto
     {
         //{"parentId":0,"menuName":"aaa","icon":"documentation","menuType":"M","orderNum":999,"visible":0,"status":0,"path":"aaa"}
-        public int parentId { get; set; }
-        public string menuName { get; set; }
-        public string icon { get; set; } = "";
-        public string menuType { get; set; }
-        public int orderNum { get; set; }
-        public int visible { get; set; }
-        public int status { get; set; }
-        public string path { get; set; } = "#";
+        [Required(ErrorMessage = "菜单id不能为空")]
         public int MenuId { get; set; }
+        public string MenuName { get; set; }
+        /// <summary>
+        /// 父菜单ID
+        /// </summary>
+        public long parentId { get; set; }
+
+        /// <summary>
+        /// 显示顺序
+        /// </summary>
+        public int orderNum { get; set; }
+
+        /// <summary>
+        /// 路由地址
+        /// </summary>
+        public string path { get; set; } = "#";
+
+        /// <summary>
+        /// 组件路径
+        /// </summary>
         public string component { get; set; }
-        public int isCache { get; set; }
-        public int isFrame { get; set; }
-        public string perms { get; set; } = "";
+
+        /// <summary>
+        /// 是否缓存（1缓存 0不缓存）
+        /// </summary>
+        [Required(ErrorMessage = "是否缓存不能为空")]
+        public string isCache { get; set; }
+        /// <summary>
+        /// 是否外链 1、是 0、否
+        /// </summary>
+        public string isFrame { get; set; }
+
+        /// <summary>
+        /// 类型（M目录 C菜单 F按钮 L链接）
+        /// </summary>
+        [Required(ErrorMessage = "菜单类型不能为空")]
+        public string menuType { get; set; }
+
+        /// <summary>
+        /// 显示状态（0显示 1隐藏）
+        /// </summary>
+        [Required(ErrorMessage = "显示状态不能为空")]
+        public string visible { get; set; }
+
+        /// <summary>
+        /// 菜单状态（0正常 1停用）
+        /// </summary>
+        [Required(ErrorMessage = "菜单状态不能为空")]
+        public string status { get; set; }
+
+        /// <summary>
+        /// 权限字符串
+        /// </summary>
+        public string perms { get; set; }
+
+        /// <summary>
+        /// 菜单图标
+        /// </summary>
+        public string icon { get; set; } = string.Empty;
     }
 }

ZR.Model/System/SysMenu.cs

@@ -14,12 +14,12 @@ namespace ZR.Model.System
         /// 菜单ID
         /// </summary>
         //[Key]//非自动增长主键时使用ExplicitKey
-        [SqlSugar.SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
-        public long menuId { get; set; }
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+        public long MenuId { get; set; }
         /// <summary>
         /// 菜单名称
         /// </summary>
-        public string menuName { get; set; }
+        public string MenuName { get; set; }
 
         /// <summary>
         /// 父菜单名称

ZR.Model/System/Vo/TreeSelectVo.cs

@@ -24,8 +24,8 @@ namespace ZR.Model.System.Vo
 
         public TreeSelectVo(SysMenu menu)
         {
-            Id = menu.menuId;
-            Label = menu.menuName;
+            Id = menu.MenuId;
+            Label = menu.MenuName;
 
             //menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList()); java写法
             List<TreeSelectVo> child = new List<TreeSelectVo>();