优化用户新增、修改和查询dto，新增表单dto

src/platform/ZhonTai.Admin/Services/User/Dto/UserAddInput.cs

@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using ZhonTai.Admin.Domain.Org;
+using System.ComponentModel.DataAnnotations;
 using ZhonTai.Admin.Domain.User;
 
 namespace ZhonTai.Admin.Services.User.Dto;
@@ -8,80 +6,16 @@ namespace ZhonTai.Admin.Services.User.Dto;
 /// <summary>
 /// 添加
 /// </summary>
-public class UserAddInput
+public class UserAddInput: UserFormInput
 {
-    /// <summary>
-    /// 账号
-    /// </summary>
-    [Required(ErrorMessage = "请输入账号")]
-    public string UserName { get; set; }
-
     /// <summary>
     /// 密码
     /// </summary>
     [Required(ErrorMessage = "请输入密码")]
-    public string Password { get; set; }
-
-    /// <summary>
-    /// 姓名
-    /// </summary>
-    [Required(ErrorMessage = "请输入姓名")]
-    public string Name { get; set; }
-
-    /// <summary>
-    /// 手机号
-    /// </summary>
-    public string Mobile { get; set; }
-
-    /// <summary>
-    /// 邮箱
-    /// </summary>
-    public string Email { get; set; }
-
-    /// <summary>
-    /// 角色
-    /// </summary>
-    public long[] RoleIds { get; set; }
-
-    /// <summary>
-    /// 所属部门
-    /// </summary>
-    public long[] OrgIds { get; set; }
-
-    public ICollection<OrgEntity> Orgs { get; set; }
-
-    /// <summary>
-    /// 主属部门Id
-    /// </summary>
-    public long OrgId { get; set; }
-
-    /// <summary>
-    /// 直属主管Id
-    /// </summary>
-    public long? ManagerUserId { get; set; }
-
-    /// <summary>
-    /// 直属主管姓名
-    /// </summary>
-    public string ManagerUserName { get; set; }
-
-    /// <summary>
-    /// 昵称
-    /// </summary>
-    public string NickName { get; set; }
-
-    /// <summary>
-    /// 头像
-    /// </summary>
-    public string Avatar { get; set; }
+    public virtual string Password { get; set; }
 
     /// <summary>
     /// 状态
     /// </summary>
-    public UserStatus Status { get; set; }
-
-    /// <summary>
-    /// 员工
-    /// </summary>
-    public StaffAddInput Staff { get; set; }
+    public UserStatus Status { get; set; } = UserStatus.Enabled;
 }

src/platform/ZhonTai.Admin/Services/User/Dto/UserFormInput.cs

@@ -0,0 +1,72 @@
+using System.ComponentModel.DataAnnotations;
+using ZhonTai.Admin.Domain.User;
+
+namespace ZhonTai.Admin.Services.User.Dto;
+
+/// <summary>
+/// 表单
+/// </summary>
+public class UserFormInput
+{
+    /// <summary>
+    /// 账号
+    /// </summary>
+    [Required(ErrorMessage = "请输入账号")]
+    public string UserName { get; set; }
+
+    /// <summary>
+    /// 姓名
+    /// </summary>
+    [Required(ErrorMessage = "请输入姓名")]
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 手机号
+    /// </summary>
+    public string Mobile { get; set; }
+
+    /// <summary>
+    /// 邮箱
+    /// </summary>
+    public string Email { get; set; }
+
+    /// <summary>
+    /// 角色
+    /// </summary>
+    public long[] RoleIds { get; set; }
+
+    /// <summary>
+    /// 所属部门
+    /// </summary>
+    public long[] OrgIds { get; set; }
+
+    /// <summary>
+    /// 主属部门Id
+    /// </summary>
+    public long OrgId { get; set; }
+
+    /// <summary>
+    /// 直属主管Id
+    /// </summary>
+    public long? ManagerUserId { get; set; }
+
+    /// <summary>
+    /// 直属主管姓名
+    /// </summary>
+    public string ManagerUserName { get; set; }
+
+    /// <summary>
+    /// 昵称
+    /// </summary>
+    public string NickName { get; set; }
+
+    /// <summary>
+    /// 头像
+    /// </summary>
+    public string Avatar { get; set; }
+
+    /// <summary>
+    /// 员工
+    /// </summary>
+    public StaffAddInput Staff { get; set; }
+}

src/platform/ZhonTai.Admin/Services/User/Dto/UserGetOutput.cs

@@ -1,6 +1,16 @@
-namespace ZhonTai.Admin.Services.User.Dto;
+using System.Collections.Generic;
+
+namespace ZhonTai.Admin.Services.User.Dto;
 
 public class UserGetOutput : UserUpdateInput
 {
+    /// <summary>
+    /// 角色
+    /// </summary>
+    public ICollection<UserGetRoleDto> Roles { get; set; }
 
+    /// <summary>
+    /// 部门列表
+    /// </summary>
+    public ICollection<UserGetOrgDto> Orgs { get; set; }
 }

src/platform/ZhonTai.Admin/Services/User/Dto/UserUpdateInput.cs

@@ -1,4 +1,5 @@
-using System.ComponentModel.DataAnnotations;
+using Newtonsoft.Json;
+using System.ComponentModel.DataAnnotations;
 using ZhonTai.Admin.Core.Validators;
 
 namespace ZhonTai.Admin.Services.User.Dto;
@@ -6,7 +7,7 @@ namespace ZhonTai.Admin.Services.User.Dto;
 /// <summary>
 /// 修改
 /// </summary>
-public partial class UserUpdateInput: UserAddInput
+public partial class UserUpdateInput: UserFormInput
 {
     /// <summary>
     /// 主键Id

src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

@@ -1559,6 +1559,13 @@
             </summary>
             <param name="args"></param>
         </member>
+        <member name="M:ZhonTai.Admin.Core.HostApp.DefaultSchemaIdSelector(System.Type)">
+            <summary>
+            实体类型重命名
+            </summary>
+            <param name="modelType"></param>
+            <returns></returns>
+        </member>
         <member name="M:ZhonTai.Admin.Core.HostApp.ConfigureServices(Microsoft.Extensions.DependencyInjection.IServiceCollection,Microsoft.AspNetCore.Hosting.IWebHostEnvironment,Microsoft.Extensions.Configuration.IConfiguration,ZhonTai.Common.Helpers.ConfigHelper,ZhonTai.Admin.Core.Configs.AppConfig)">
             <summary>
             配置服务
@@ -5532,139 +5539,154 @@
             添加
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddInput.UserName">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddInput.Password">
+            <summary>
+            密码
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddInput.Status">
+            <summary>
+            状态
+            </summary>
+        </member>
+        <member name="T:ZhonTai.Admin.Services.User.Dto.UserAddMemberInput">
+            <summary>
+            添加会员
+            </summary>
+        </member>
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddMemberInput.UserName">
             <summary>
             账号
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddInput.Password">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddMemberInput.Password">
             <summary>
             密码
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddInput.Name">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddMemberInput.Name">
             <summary>
             姓名
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddInput.Mobile">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddMemberInput.Mobile">
             <summary>
             手机号
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddInput.Email">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddMemberInput.Email">
             <summary>
             邮箱
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddInput.RoleIds">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddMemberInput.NickName">
             <summary>
-            角色
+            昵称
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddInput.OrgIds">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddMemberInput.Avatar">
             <summary>
-            所属部门
+            头像
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddInput.OrgId">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddMemberInput.Status">
             <summary>
-            主属部门Id
+            状态
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddInput.ManagerUserId">
+        <member name="T:ZhonTai.Admin.Services.User.Dto.UserChangePasswordInput">
             <summary>
-            直属主管Id
+            修改密码
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddInput.ManagerUserName">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserChangePasswordInput.OldPassword">
             <summary>
-            直属主管姓名
+            旧密码
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddInput.NickName">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserChangePasswordInput.NewPassword">
             <summary>
-            昵称
+            新密码
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddInput.Avatar">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserChangePasswordInput.ConfirmPassword">
             <summary>
-            头像
+            确认新密码
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddInput.Status">
+        <member name="T:ZhonTai.Admin.Services.User.Dto.UserFormInput">
             <summary>
-            状态
+            表单
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddInput.Staff">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserFormInput.UserName">
             <summary>
-            员工
+            账号
             </summary>
         </member>
-        <member name="T:ZhonTai.Admin.Services.User.Dto.UserAddMemberInput">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserFormInput.Name">
             <summary>
-            添加会员
+            姓名
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddMemberInput.UserName">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserFormInput.Mobile">
             <summary>
-            账号
+            手机号
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddMemberInput.Password">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserFormInput.Email">
             <summary>
-            密码
+            邮箱
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddMemberInput.Name">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserFormInput.RoleIds">
             <summary>
-            姓名
+            角色
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddMemberInput.Mobile">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserFormInput.OrgIds">
             <summary>
-            手机号
+            所属部门
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddMemberInput.Email">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserFormInput.OrgId">
             <summary>
-            邮箱
+            主属部门Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddMemberInput.NickName">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserFormInput.ManagerUserId">
             <summary>
-            昵称
+            直属主管Id
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddMemberInput.Avatar">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserFormInput.ManagerUserName">
             <summary>
-            头像
+            直属主管姓名
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserAddMemberInput.Status">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserFormInput.NickName">
             <summary>
-            状态
+            昵称
             </summary>
         </member>
-        <member name="T:ZhonTai.Admin.Services.User.Dto.UserChangePasswordInput">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserFormInput.Avatar">
             <summary>
-            修改密码
+            头像
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserChangePasswordInput.OldPassword">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserFormInput.Staff">
             <summary>
-            旧密码
+            员工
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserChangePasswordInput.NewPassword">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserGetOutput.Roles">
             <summary>
-            新密码
+            角色
             </summary>
         </member>
-        <member name="P:ZhonTai.Admin.Services.User.Dto.UserChangePasswordInput.ConfirmPassword">
+        <member name="P:ZhonTai.Admin.Services.User.Dto.UserGetOutput.Orgs">
             <summary>
-            确认新密码
+            部门列表
             </summary>
         </member>
         <member name="P:ZhonTai.Admin.Services.User.Dto.UserGetPageOutput.Id">