Merge branch 'master' into net6.0

ZR.Model/System/Dto/GenTableDto.cs

@@ -21,6 +21,7 @@ namespace ZR.Model.System.Dto
         public string FunctionAuthor { get; set; }
         public string GenType { get; set; }
         public string GenPath { get; set; }
+        public string PermissionPrefix { get; set; }
         /// <summary>
         /// 额外参数
         /// </summary>
@@ -44,6 +45,7 @@ namespace ZR.Model.System.Dto
         /// 额外参数字符串
         /// </summary>
         public string checkedBtn { get; set; }
+        public string permissionPrefix { get; set; }
     }
     public class GenTableColumnDto
     {

ZR.Model/System/Dto/RegisterDto.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+
+namespace ZR.Model.System.Dto
+{
+    public class RegisterDto
+    {
+        /// <summary>
+        /// 用户名
+        /// </summary>
+        [Required(ErrorMessage = "用户名不能为空")]
+        public string Username { get; set; }
+
+        /// <summary>
+        /// 用户密码
+        /// </summary>
+        [Required(ErrorMessage = "密码不能为空")]
+        public string Password { get; set; }
+        [Required(ErrorMessage = "确认密码不能为空")]
+        public string ConfirmPassword { get; set; }
+        /**
+         * 验证码
+         */
+        public string Code { get; set; }
+
+        /**
+         * 唯一标识
+         */
+        public string Uuid { get; set; } = "";
+    }
+}

ZR.Model/System/Generate/GenTable.cs

@@ -96,6 +96,8 @@ namespace ZR.Model.System.Generate
 
         [SqlSugar.SugarColumn(IsIgnore = true)]
         public object TreeParentCode { get; set; }
+        [SqlSugar.SugarColumn(IsIgnore = true)]
+        public string PermissionPrefix { get; set; }
         /// <summary>
         /// 生成的按钮功能
         /// </summary>