升级依赖包及更新接口文件

Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -24,9 +24,9 @@
 
   <ItemGroup>
     <PackageReference Include="AspNetCoreRateLimit" Version="4.0.2" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.6.0" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.6.0" />
-    <PackageReference Include="Furion.Pure" Version="4.6.0" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.6.1" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.6.1" />
+    <PackageReference Include="Furion.Pure" Version="4.6.1" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.6.4" />
     <PackageReference Include="Magicodes.IE.Pdf" Version="2.6.4" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.9" />

Admin.NET/Admin.NET.Web.Core/Admin.NET.Web.Core.csproj

@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="6.0.11" />
+    <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="6.0.12" />
     <PackageReference Include="IGeekFan.AspNetCore.Knife4jUI" Version="0.0.12" />
   </ItemGroup>
 

vue-next-admin/src/api-services/apis/sys-user-api.ts

@@ -284,29 +284,11 @@ export const SysUserApiAxiosParamCreator = function (configuration?: Configurati
          * 
          * @summary 获取用户拥有机构
          * @param {number} id 主键Id
-         * @param {string} [userName] 账号
-         * @param {string} [password] 密码（默认MD5加密）
-         * @param {string} [nickName] 昵称
-         * @param {string} [avatar] 头像
-         * @param {Date} [birthday] 出生日期
-         * @param {number} [sex] 性别
-         * @param {string} [email] 邮箱
-         * @param {string} [phone] 手机号码
-         * @param {string} [realName] 真实姓名
-         * @param {string} [idCard] 身份证号
-         * @param {string} [signature] 个性签名
-         * @param {string} [introduction] 个人简介
-         * @param {number} [userType] 账号类型-超级管理员_1、管理员_2、普通_3
-         * @param {string} [remark] 备注
          * @param {number} [status] 状态
-         * @param {number} [orgId] 机构Id
-         * @param {number} [posId] 职位Id
-         * @param {string} [jobNum] 工号
-         * @param {number} [jobStatus] 岗位状态
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        sysUserOwnOrgGet: async (id: number, userName?: string, password?: string, nickName?: string, avatar?: string, birthday?: Date, sex?: number, email?: string, phone?: string, realName?: string, idCard?: string, signature?: string, introduction?: string, userType?: number, remark?: string, status?: number, orgId?: number, posId?: number, jobNum?: string, jobStatus?: number, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        sysUserOwnOrgGet: async (id: number, status?: number, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'id' is not null or undefined
             if (id === null || id === undefined) {
                 throw new RequiredError('id','Required parameter id was null or undefined when calling sysUserOwnOrgGet.');
@@ -324,84 +306,10 @@ export const SysUserApiAxiosParamCreator = function (configuration?: Configurati
 
             // authentication Bearer required
 
-            if (userName !== undefined) {
-                localVarQueryParameter['UserName'] = userName;
-            }
-
-            if (password !== undefined) {
-                localVarQueryParameter['Password'] = password;
-            }
-
-            if (nickName !== undefined) {
-                localVarQueryParameter['NickName'] = nickName;
-            }
-
-            if (avatar !== undefined) {
-                localVarQueryParameter['Avatar'] = avatar;
-            }
-
-            if (birthday !== undefined) {
-                localVarQueryParameter['Birthday'] = (birthday as any instanceof Date) ?
-                    (birthday as any).toISOString() :
-                    birthday;
-            }
-
-            if (sex !== undefined) {
-                localVarQueryParameter['Sex'] = sex;
-            }
-
-            if (email !== undefined) {
-                localVarQueryParameter['Email'] = email;
-            }
-
-            if (phone !== undefined) {
-                localVarQueryParameter['Phone'] = phone;
-            }
-
-            if (realName !== undefined) {
-                localVarQueryParameter['RealName'] = realName;
-            }
-
-            if (idCard !== undefined) {
-                localVarQueryParameter['IdCard'] = idCard;
-            }
-
-            if (signature !== undefined) {
-                localVarQueryParameter['Signature'] = signature;
-            }
-
-            if (introduction !== undefined) {
-                localVarQueryParameter['Introduction'] = introduction;
-            }
-
-            if (userType !== undefined) {
-                localVarQueryParameter['UserType'] = userType;
-            }
-
-            if (remark !== undefined) {
-                localVarQueryParameter['Remark'] = remark;
-            }
-
             if (status !== undefined) {
                 localVarQueryParameter['Status'] = status;
             }
 
-            if (orgId !== undefined) {
-                localVarQueryParameter['OrgId'] = orgId;
-            }
-
-            if (posId !== undefined) {
-                localVarQueryParameter['PosId'] = posId;
-            }
-
-            if (jobNum !== undefined) {
-                localVarQueryParameter['JobNum'] = jobNum;
-            }
-
-            if (jobStatus !== undefined) {
-                localVarQueryParameter['JobStatus'] = jobStatus;
-            }
-
             if (id !== undefined) {
                 localVarQueryParameter['Id'] = id;
             }
@@ -426,29 +334,11 @@ export const SysUserApiAxiosParamCreator = function (configuration?: Configurati
          * 
          * @summary 获取用户拥有角色
          * @param {number} id 主键Id
-         * @param {string} [userName] 账号
-         * @param {string} [password] 密码（默认MD5加密）
-         * @param {string} [nickName] 昵称
-         * @param {string} [avatar] 头像
-         * @param {Date} [birthday] 出生日期
-         * @param {number} [sex] 性别
-         * @param {string} [email] 邮箱
-         * @param {string} [phone] 手机号码
-         * @param {string} [realName] 真实姓名
-         * @param {string} [idCard] 身份证号
-         * @param {string} [signature] 个性签名
-         * @param {string} [introduction] 个人简介
-         * @param {number} [userType] 账号类型-超级管理员_1、管理员_2、普通_3
-         * @param {string} [remark] 备注
          * @param {number} [status] 状态
-         * @param {number} [orgId] 机构Id
-         * @param {number} [posId] 职位Id
-         * @param {string} [jobNum] 工号
-         * @param {number} [jobStatus] 岗位状态
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        sysUserOwnRoleGet: async (id: number, userName?: string, password?: string, nickName?: string, avatar?: string, birthday?: Date, sex?: number, email?: string, phone?: string, realName?: string, idCard?: string, signature?: string, introduction?: string, userType?: number, remark?: string, status?: number, orgId?: number, posId?: number, jobNum?: string, jobStatus?: number, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        sysUserOwnRoleGet: async (id: number, status?: number, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'id' is not null or undefined
             if (id === null || id === undefined) {
                 throw new RequiredError('id','Required parameter id was null or undefined when calling sysUserOwnRoleGet.');
@@ -466,84 +356,10 @@ export const SysUserApiAxiosParamCreator = function (configuration?: Configurati
 
             // authentication Bearer required
 
-            if (userName !== undefined) {
-                localVarQueryParameter['UserName'] = userName;
-            }
-
-            if (password !== undefined) {
-                localVarQueryParameter['Password'] = password;
-            }
-
-            if (nickName !== undefined) {
-                localVarQueryParameter['NickName'] = nickName;
-            }
-
-            if (avatar !== undefined) {
-                localVarQueryParameter['Avatar'] = avatar;
-            }
-
-            if (birthday !== undefined) {
-                localVarQueryParameter['Birthday'] = (birthday as any instanceof Date) ?
-                    (birthday as any).toISOString() :
-                    birthday;
-            }
-
-            if (sex !== undefined) {
-                localVarQueryParameter['Sex'] = sex;
-            }
-
-            if (email !== undefined) {
-                localVarQueryParameter['Email'] = email;
-            }
-
-            if (phone !== undefined) {
-                localVarQueryParameter['Phone'] = phone;
-            }
-
-            if (realName !== undefined) {
-                localVarQueryParameter['RealName'] = realName;
-            }
-
-            if (idCard !== undefined) {
-                localVarQueryParameter['IdCard'] = idCard;
-            }
-
-            if (signature !== undefined) {
-                localVarQueryParameter['Signature'] = signature;
-            }
-
-            if (introduction !== undefined) {
-                localVarQueryParameter['Introduction'] = introduction;
-            }
-
-            if (userType !== undefined) {
-                localVarQueryParameter['UserType'] = userType;
-            }
-
-            if (remark !== undefined) {
-                localVarQueryParameter['Remark'] = remark;
-            }
-
             if (status !== undefined) {
                 localVarQueryParameter['Status'] = status;
             }
 
-            if (orgId !== undefined) {
-                localVarQueryParameter['OrgId'] = orgId;
-            }
-
-            if (posId !== undefined) {
-                localVarQueryParameter['PosId'] = posId;
-            }
-
-            if (jobNum !== undefined) {
-                localVarQueryParameter['JobNum'] = jobNum;
-            }
-
-            if (jobStatus !== undefined) {
-                localVarQueryParameter['JobStatus'] = jobStatus;
-            }
-
             if (id !== undefined) {
                 localVarQueryParameter['Id'] = id;
             }
@@ -860,30 +676,12 @@ export const SysUserApiFp = function(configuration?: Configuration) {
          * 
          * @summary 获取用户拥有机构
          * @param {number} id 主键Id
-         * @param {string} [userName] 账号
-         * @param {string} [password] 密码（默认MD5加密）
-         * @param {string} [nickName] 昵称
-         * @param {string} [avatar] 头像
-         * @param {Date} [birthday] 出生日期
-         * @param {number} [sex] 性别
-         * @param {string} [email] 邮箱
-         * @param {string} [phone] 手机号码
-         * @param {string} [realName] 真实姓名
-         * @param {string} [idCard] 身份证号
-         * @param {string} [signature] 个性签名
-         * @param {string} [introduction] 个人简介
-         * @param {number} [userType] 账号类型-超级管理员_1、管理员_2、普通_3
-         * @param {string} [remark] 备注
          * @param {number} [status] 状态
-         * @param {number} [orgId] 机构Id
-         * @param {number} [posId] 职位Id
-         * @param {string} [jobNum] 工号
-         * @param {number} [jobStatus] 岗位状态
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async sysUserOwnOrgGet(id: number, userName?: string, password?: string, nickName?: string, avatar?: string, birthday?: Date, sex?: number, email?: string, phone?: string, realName?: string, idCard?: string, signature?: string, introduction?: string, userType?: number, remark?: string, status?: number, orgId?: number, posId?: number, jobNum?: string, jobStatus?: number, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListInt64>>> {
-            const localVarAxiosArgs = await SysUserApiAxiosParamCreator(configuration).sysUserOwnOrgGet(id, userName, password, nickName, avatar, birthday, sex, email, phone, realName, idCard, signature, introduction, userType, remark, status, orgId, posId, jobNum, jobStatus, options);
+        async sysUserOwnOrgGet(id: number, status?: number, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListInt64>>> {
+            const localVarAxiosArgs = await SysUserApiAxiosParamCreator(configuration).sysUserOwnOrgGet(id, status, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -893,30 +691,12 @@ export const SysUserApiFp = function(configuration?: Configuration) {
          * 
          * @summary 获取用户拥有角色
          * @param {number} id 主键Id
-         * @param {string} [userName] 账号
-         * @param {string} [password] 密码（默认MD5加密）
-         * @param {string} [nickName] 昵称
-         * @param {string} [avatar] 头像
-         * @param {Date} [birthday] 出生日期
-         * @param {number} [sex] 性别
-         * @param {string} [email] 邮箱
-         * @param {string} [phone] 手机号码
-         * @param {string} [realName] 真实姓名
-         * @param {string} [idCard] 身份证号
-         * @param {string} [signature] 个性签名
-         * @param {string} [introduction] 个人简介
-         * @param {number} [userType] 账号类型-超级管理员_1、管理员_2、普通_3
-         * @param {string} [remark] 备注
          * @param {number} [status] 状态
-         * @param {number} [orgId] 机构Id
-         * @param {number} [posId] 职位Id
-         * @param {string} [jobNum] 工号
-         * @param {number} [jobStatus] 岗位状态
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async sysUserOwnRoleGet(id: number, userName?: string, password?: string, nickName?: string, avatar?: string, birthday?: Date, sex?: number, email?: string, phone?: string, realName?: string, idCard?: string, signature?: string, introduction?: string, userType?: number, remark?: string, status?: number, orgId?: number, posId?: number, jobNum?: string, jobStatus?: number, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListInt64>>> {
-            const localVarAxiosArgs = await SysUserApiAxiosParamCreator(configuration).sysUserOwnRoleGet(id, userName, password, nickName, avatar, birthday, sex, email, phone, realName, idCard, signature, introduction, userType, remark, status, orgId, posId, jobNum, jobStatus, options);
+        async sysUserOwnRoleGet(id: number, status?: number, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListInt64>>> {
+            const localVarAxiosArgs = await SysUserApiAxiosParamCreator(configuration).sysUserOwnRoleGet(id, status, options);
             return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
                 const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
                 return axios.request(axiosRequestArgs);
@@ -1058,59 +838,23 @@ export const SysUserApiFactory = function (configuration?: Configuration, basePa
          * 
          * @summary 获取用户拥有机构
          * @param {number} id 主键Id
-         * @param {string} [userName] 账号
-         * @param {string} [password] 密码（默认MD5加密）
-         * @param {string} [nickName] 昵称
-         * @param {string} [avatar] 头像
-         * @param {Date} [birthday] 出生日期
-         * @param {number} [sex] 性别
-         * @param {string} [email] 邮箱
-         * @param {string} [phone] 手机号码
-         * @param {string} [realName] 真实姓名
-         * @param {string} [idCard] 身份证号
-         * @param {string} [signature] 个性签名
-         * @param {string} [introduction] 个人简介
-         * @param {number} [userType] 账号类型-超级管理员_1、管理员_2、普通_3
-         * @param {string} [remark] 备注
          * @param {number} [status] 状态
-         * @param {number} [orgId] 机构Id
-         * @param {number} [posId] 职位Id
-         * @param {string} [jobNum] 工号
-         * @param {number} [jobStatus] 岗位状态
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async sysUserOwnOrgGet(id: number, userName?: string, password?: string, nickName?: string, avatar?: string, birthday?: Date, sex?: number, email?: string, phone?: string, realName?: string, idCard?: string, signature?: string, introduction?: string, userType?: number, remark?: string, status?: number, orgId?: number, posId?: number, jobNum?: string, jobStatus?: number, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListInt64>> {
-            return SysUserApiFp(configuration).sysUserOwnOrgGet(id, userName, password, nickName, avatar, birthday, sex, email, phone, realName, idCard, signature, introduction, userType, remark, status, orgId, posId, jobNum, jobStatus, options).then((request) => request(axios, basePath));
+        async sysUserOwnOrgGet(id: number, status?: number, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListInt64>> {
+            return SysUserApiFp(configuration).sysUserOwnOrgGet(id, status, options).then((request) => request(axios, basePath));
         },
         /**
          * 
          * @summary 获取用户拥有角色
          * @param {number} id 主键Id
-         * @param {string} [userName] 账号
-         * @param {string} [password] 密码（默认MD5加密）
-         * @param {string} [nickName] 昵称
-         * @param {string} [avatar] 头像
-         * @param {Date} [birthday] 出生日期
-         * @param {number} [sex] 性别
-         * @param {string} [email] 邮箱
-         * @param {string} [phone] 手机号码
-         * @param {string} [realName] 真实姓名
-         * @param {string} [idCard] 身份证号
-         * @param {string} [signature] 个性签名
-         * @param {string} [introduction] 个人简介
-         * @param {number} [userType] 账号类型-超级管理员_1、管理员_2、普通_3
-         * @param {string} [remark] 备注
          * @param {number} [status] 状态
-         * @param {number} [orgId] 机构Id
-         * @param {number} [posId] 职位Id
-         * @param {string} [jobNum] 工号
-         * @param {number} [jobStatus] 岗位状态
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async sysUserOwnRoleGet(id: number, userName?: string, password?: string, nickName?: string, avatar?: string, birthday?: Date, sex?: number, email?: string, phone?: string, realName?: string, idCard?: string, signature?: string, introduction?: string, userType?: number, remark?: string, status?: number, orgId?: number, posId?: number, jobNum?: string, jobStatus?: number, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListInt64>> {
-            return SysUserApiFp(configuration).sysUserOwnRoleGet(id, userName, password, nickName, avatar, birthday, sex, email, phone, realName, idCard, signature, introduction, userType, remark, status, orgId, posId, jobNum, jobStatus, options).then((request) => request(axios, basePath));
+        async sysUserOwnRoleGet(id: number, status?: number, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListInt64>> {
+            return SysUserApiFp(configuration).sysUserOwnRoleGet(id, status, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -1239,61 +983,25 @@ export class SysUserApi extends BaseAPI {
      * 
      * @summary 获取用户拥有机构
      * @param {number} id 主键Id
-     * @param {string} [userName] 账号
-     * @param {string} [password] 密码（默认MD5加密）
-     * @param {string} [nickName] 昵称
-     * @param {string} [avatar] 头像
-     * @param {Date} [birthday] 出生日期
-     * @param {number} [sex] 性别
-     * @param {string} [email] 邮箱
-     * @param {string} [phone] 手机号码
-     * @param {string} [realName] 真实姓名
-     * @param {string} [idCard] 身份证号
-     * @param {string} [signature] 个性签名
-     * @param {string} [introduction] 个人简介
-     * @param {number} [userType] 账号类型-超级管理员_1、管理员_2、普通_3
-     * @param {string} [remark] 备注
      * @param {number} [status] 状态
-     * @param {number} [orgId] 机构Id
-     * @param {number} [posId] 职位Id
-     * @param {string} [jobNum] 工号
-     * @param {number} [jobStatus] 岗位状态
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SysUserApi
      */
-    public async sysUserOwnOrgGet(id: number, userName?: string, password?: string, nickName?: string, avatar?: string, birthday?: Date, sex?: number, email?: string, phone?: string, realName?: string, idCard?: string, signature?: string, introduction?: string, userType?: number, remark?: string, status?: number, orgId?: number, posId?: number, jobNum?: string, jobStatus?: number, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListInt64>> {
-        return SysUserApiFp(this.configuration).sysUserOwnOrgGet(id, userName, password, nickName, avatar, birthday, sex, email, phone, realName, idCard, signature, introduction, userType, remark, status, orgId, posId, jobNum, jobStatus, options).then((request) => request(this.axios, this.basePath));
+    public async sysUserOwnOrgGet(id: number, status?: number, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListInt64>> {
+        return SysUserApiFp(this.configuration).sysUserOwnOrgGet(id, status, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 
      * @summary 获取用户拥有角色
      * @param {number} id 主键Id
-     * @param {string} [userName] 账号
-     * @param {string} [password] 密码（默认MD5加密）
-     * @param {string} [nickName] 昵称
-     * @param {string} [avatar] 头像
-     * @param {Date} [birthday] 出生日期
-     * @param {number} [sex] 性别
-     * @param {string} [email] 邮箱
-     * @param {string} [phone] 手机号码
-     * @param {string} [realName] 真实姓名
-     * @param {string} [idCard] 身份证号
-     * @param {string} [signature] 个性签名
-     * @param {string} [introduction] 个人简介
-     * @param {number} [userType] 账号类型-超级管理员_1、管理员_2、普通_3
-     * @param {string} [remark] 备注
      * @param {number} [status] 状态
-     * @param {number} [orgId] 机构Id
-     * @param {number} [posId] 职位Id
-     * @param {string} [jobNum] 工号
-     * @param {number} [jobStatus] 岗位状态
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SysUserApi
      */
-    public async sysUserOwnRoleGet(id: number, userName?: string, password?: string, nickName?: string, avatar?: string, birthday?: Date, sex?: number, email?: string, phone?: string, realName?: string, idCard?: string, signature?: string, introduction?: string, userType?: number, remark?: string, status?: number, orgId?: number, posId?: number, jobNum?: string, jobStatus?: number, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListInt64>> {
-        return SysUserApiFp(this.configuration).sysUserOwnRoleGet(id, userName, password, nickName, avatar, birthday, sex, email, phone, realName, idCard, signature, introduction, userType, remark, status, orgId, posId, jobNum, jobStatus, options).then((request) => request(this.axios, this.basePath));
+    public async sysUserOwnRoleGet(id: number, status?: number, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListInt64>> {
+        return SysUserApiFp(this.configuration).sysUserOwnRoleGet(id, status, options).then((request) => request(this.axios, this.basePath));
     }
     /**
      * 

vue-next-admin/src/api-services/models/add-timer-input.ts

@@ -116,6 +116,12 @@ export interface AddTimerInput {
      * @memberof AddTimerInput
      */
     headers?: string | null;
+    /**
+     * 排序
+     * @type {number}
+     * @memberof AddTimerInput
+     */
+    order?: number;
     /**
      * 备注
      * @type {string}

vue-next-admin/src/api-services/models/add-user-input.ts

@@ -11,6 +11,12 @@
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
+import { GenderEnum } from './gender-enum';
+import { JobStatusEnum } from './job-status-enum';
+import { StatusEnum } from './status-enum';
+import { SysOrg } from './sys-org';
+import { SysPos } from './sys-pos';
+import { UserTypeEnum } from './user-type-enum';
 /**
  * 
  * @export
@@ -18,17 +24,47 @@
  */
 export interface AddUserInput {
     /**
-     * 主键Id
+     * 雪花Id
      * @type {number}
      * @memberof AddUserInput
      */
-    id: number;
+    id?: number;
     /**
-     * 密码（默认MD5加密）
-     * @type {string}
+     * 创建时间
+     * @type {Date}
      * @memberof AddUserInput
      */
-    password?: string | null;
+    createTime?: Date | null;
+    /**
+     * 更新时间
+     * @type {Date}
+     * @memberof AddUserInput
+     */
+    updateTime?: Date | null;
+    /**
+     * 创建者Id
+     * @type {number}
+     * @memberof AddUserInput
+     */
+    createUserId?: number | null;
+    /**
+     * 修改者Id
+     * @type {number}
+     * @memberof AddUserInput
+     */
+    updateUserId?: number | null;
+    /**
+     * 软删除
+     * @type {boolean}
+     * @memberof AddUserInput
+     */
+    isDelete?: boolean;
+    /**
+     * 租户Id
+     * @type {number}
+     * @memberof AddUserInput
+     */
+    tenantId?: number | null;
     /**
      * 昵称
      * @type {string}
@@ -48,11 +84,11 @@ export interface AddUserInput {
      */
     birthday?: Date | null;
     /**
-     * 性别
-     * @type {number}
+     * 
+     * @type {GenderEnum}
      * @memberof AddUserInput
      */
-    sex?: number;
+    sex?: GenderEnum;
     /**
      * 邮箱
      * @type {string}
@@ -84,35 +120,35 @@ export interface AddUserInput {
      */
     introduction?: string | null;
     /**
-     * 账号类型-超级管理员_1、管理员_2、普通_3
-     * @type {number}
+     * 
+     * @type {UserTypeEnum}
      * @memberof AddUserInput
      */
-    userType?: number;
+    userType?: UserTypeEnum;
     /**
-     * 备注
-     * @type {string}
-     * @memberof AddUserInput
-     */
-    remark?: string | null;
-    /**
-     * 状态
+     * 机构Id
      * @type {number}
      * @memberof AddUserInput
      */
-    status?: number;
+    orgId?: number;
     /**
-     * 机构Id
-     * @type {number}
+     * 
+     * @type {SysOrg}
      * @memberof AddUserInput
      */
-    orgId?: number;
+    sysOrg?: SysOrg;
     /**
      * 职位Id
      * @type {number}
      * @memberof AddUserInput
      */
     posId?: number;
+    /**
+     * 
+     * @type {SysPos}
+     * @memberof AddUserInput
+     */
+    sysPos?: SysPos;
     /**
      * 工号
      * @type {string}
@@ -120,11 +156,29 @@ export interface AddUserInput {
      */
     jobNum?: string | null;
     /**
-     * 岗位状态
+     * 
+     * @type {JobStatusEnum}
+     * @memberof AddUserInput
+     */
+    jobStatus?: JobStatusEnum;
+    /**
+     * 排序
      * @type {number}
      * @memberof AddUserInput
      */
-    jobStatus?: number;
+    order?: number;
+    /**
+     * 
+     * @type {StatusEnum}
+     * @memberof AddUserInput
+     */
+    status?: StatusEnum;
+    /**
+     * 备注
+     * @type {string}
+     * @memberof AddUserInput
+     */
+    remark?: string | null;
     /**
      * 账号名称
      * @type {string}

vue-next-admin/src/api-services/models/sys-tenant.ts

@@ -95,6 +95,12 @@ export interface SysTenant {
      * @memberof SysTenant
      */
     schema?: string | null;
+    /**
+     * 排序
+     * @type {number}
+     * @memberof SysTenant
+     */
+    order?: number;
     /**
      * 备注
      * @type {string}

vue-next-admin/src/api-services/models/sys-user.ts

@@ -137,18 +137,6 @@ export interface SysUser {
      * @memberof SysUser
      */
     userType?: UserTypeEnum;
-    /**
-     * 备注
-     * @type {string}
-     * @memberof SysUser
-     */
-    remark?: string | null;
-    /**
-     * 
-     * @type {StatusEnum}
-     * @memberof SysUser
-     */
-    status?: StatusEnum;
     /**
      * 机构Id
      * @type {number}
@@ -185,4 +173,22 @@ export interface SysUser {
      * @memberof SysUser
      */
     jobStatus?: JobStatusEnum;
+    /**
+     * 排序
+     * @type {number}
+     * @memberof SysUser
+     */
+    order?: number;
+    /**
+     * 
+     * @type {StatusEnum}
+     * @memberof SysUser
+     */
+    status?: StatusEnum;
+    /**
+     * 备注
+     * @type {string}
+     * @memberof SysUser
+     */
+    remark?: string | null;
 }

vue-next-admin/src/api-services/models/timer-output.ts

@@ -123,6 +123,12 @@ export interface TimerOutput {
      * @memberof TimerOutput
      */
     headers?: string | null;
+    /**
+     * 排序
+     * @type {number}
+     * @memberof TimerOutput
+     */
+    order?: number;
     /**
      * 备注
      * @type {string}

vue-next-admin/src/api-services/models/update-timer-input.ts

@@ -116,6 +116,12 @@ export interface UpdateTimerInput {
      * @memberof UpdateTimerInput
      */
     headers?: string | null;
+    /**
+     * 排序
+     * @type {number}
+     * @memberof UpdateTimerInput
+     */
+    order?: number;
     /**
      * 备注
      * @type {string}

vue-next-admin/src/api-services/models/update-user-input.ts

@@ -11,6 +11,12 @@
  * https://github.com/swagger-api/swagger-codegen.git
  * Do not edit the class manually.
  */
+import { GenderEnum } from './gender-enum';
+import { JobStatusEnum } from './job-status-enum';
+import { StatusEnum } from './status-enum';
+import { SysOrg } from './sys-org';
+import { SysPos } from './sys-pos';
+import { UserTypeEnum } from './user-type-enum';
 /**
  * 
  * @export
@@ -18,17 +24,47 @@
  */
 export interface UpdateUserInput {
     /**
-     * 主键Id
+     * 雪花Id
      * @type {number}
      * @memberof UpdateUserInput
      */
-    id: number;
+    id?: number;
     /**
-     * 密码（默认MD5加密）
-     * @type {string}
+     * 创建时间
+     * @type {Date}
      * @memberof UpdateUserInput
      */
-    password?: string | null;
+    createTime?: Date | null;
+    /**
+     * 更新时间
+     * @type {Date}
+     * @memberof UpdateUserInput
+     */
+    updateTime?: Date | null;
+    /**
+     * 创建者Id
+     * @type {number}
+     * @memberof UpdateUserInput
+     */
+    createUserId?: number | null;
+    /**
+     * 修改者Id
+     * @type {number}
+     * @memberof UpdateUserInput
+     */
+    updateUserId?: number | null;
+    /**
+     * 软删除
+     * @type {boolean}
+     * @memberof UpdateUserInput
+     */
+    isDelete?: boolean;
+    /**
+     * 租户Id
+     * @type {number}
+     * @memberof UpdateUserInput
+     */
+    tenantId?: number | null;
     /**
      * 昵称
      * @type {string}
@@ -48,11 +84,11 @@ export interface UpdateUserInput {
      */
     birthday?: Date | null;
     /**
-     * 性别
-     * @type {number}
+     * 
+     * @type {GenderEnum}
      * @memberof UpdateUserInput
      */
-    sex?: number;
+    sex?: GenderEnum;
     /**
      * 邮箱
      * @type {string}
@@ -84,35 +120,35 @@ export interface UpdateUserInput {
      */
     introduction?: string | null;
     /**
-     * 账号类型-超级管理员_1、管理员_2、普通_3
-     * @type {number}
+     * 
+     * @type {UserTypeEnum}
      * @memberof UpdateUserInput
      */
-    userType?: number;
+    userType?: UserTypeEnum;
     /**
-     * 备注
-     * @type {string}
-     * @memberof UpdateUserInput
-     */
-    remark?: string | null;
-    /**
-     * 状态
+     * 机构Id
      * @type {number}
      * @memberof UpdateUserInput
      */
-    status?: number;
+    orgId?: number;
     /**
-     * 机构Id
-     * @type {number}
+     * 
+     * @type {SysOrg}
      * @memberof UpdateUserInput
      */
-    orgId?: number;
+    sysOrg?: SysOrg;
     /**
      * 职位Id
      * @type {number}
      * @memberof UpdateUserInput
      */
     posId?: number;
+    /**
+     * 
+     * @type {SysPos}
+     * @memberof UpdateUserInput
+     */
+    sysPos?: SysPos;
     /**
      * 工号
      * @type {string}
@@ -120,11 +156,29 @@ export interface UpdateUserInput {
      */
     jobNum?: string | null;
     /**
-     * 岗位状态
+     * 
+     * @type {JobStatusEnum}
+     * @memberof UpdateUserInput
+     */
+    jobStatus?: JobStatusEnum;
+    /**
+     * 排序
      * @type {number}
      * @memberof UpdateUserInput
      */
-    jobStatus?: number;
+    order?: number;
+    /**
+     * 
+     * @type {StatusEnum}
+     * @memberof UpdateUserInput
+     */
+    status?: StatusEnum;
+    /**
+     * 备注
+     * @type {string}
+     * @memberof UpdateUserInput
+     */
+    remark?: string | null;
     /**
      * 账号名称
      * @type {string}

vue-next-admin/src/api-services/models/user-input.ts

@@ -23,118 +23,10 @@ export interface UserInput {
      * @memberof UserInput
      */
     id: number;
-    /**
-     * 账号
-     * @type {string}
-     * @memberof UserInput
-     */
-    userName?: string | null;
-    /**
-     * 密码（默认MD5加密）
-     * @type {string}
-     * @memberof UserInput
-     */
-    password?: string | null;
-    /**
-     * 昵称
-     * @type {string}
-     * @memberof UserInput
-     */
-    nickName?: string | null;
-    /**
-     * 头像
-     * @type {string}
-     * @memberof UserInput
-     */
-    avatar?: string | null;
-    /**
-     * 出生日期
-     * @type {Date}
-     * @memberof UserInput
-     */
-    birthday?: Date | null;
-    /**
-     * 性别
-     * @type {number}
-     * @memberof UserInput
-     */
-    sex?: number;
-    /**
-     * 邮箱
-     * @type {string}
-     * @memberof UserInput
-     */
-    email?: string | null;
-    /**
-     * 手机号码
-     * @type {string}
-     * @memberof UserInput
-     */
-    phone?: string | null;
-    /**
-     * 真实姓名
-     * @type {string}
-     * @memberof UserInput
-     */
-    realName?: string | null;
-    /**
-     * 身份证号
-     * @type {string}
-     * @memberof UserInput
-     */
-    idCard?: string | null;
-    /**
-     * 个性签名
-     * @type {string}
-     * @memberof UserInput
-     */
-    signature?: string | null;
-    /**
-     * 个人简介
-     * @type {string}
-     * @memberof UserInput
-     */
-    introduction?: string | null;
-    /**
-     * 账号类型-超级管理员_1、管理员_2、普通_3
-     * @type {number}
-     * @memberof UserInput
-     */
-    userType?: number;
-    /**
-     * 备注
-     * @type {string}
-     * @memberof UserInput
-     */
-    remark?: string | null;
     /**
      * 状态
      * @type {number}
      * @memberof UserInput
      */
     status?: number;
-    /**
-     * 机构Id
-     * @type {number}
-     * @memberof UserInput
-     */
-    orgId?: number;
-    /**
-     * 职位Id
-     * @type {number}
-     * @memberof UserInput
-     */
-    posId?: number;
-    /**
-     * 工号
-     * @type {string}
-     * @memberof UserInput
-     */
-    jobNum?: string | null;
-    /**
-     * 岗位状态
-     * @type {number}
-     * @memberof UserInput
-     */
-    jobStatus?: number;
 }