update [重大更新]全业务增加接口文档注解格式化代码

2025-09-24 07:19:46 +08:00 · 2021-10-15 15:19:42 +08:00
parent bb43b2853d
commit a6fb88d74c
115 changed files with 2600 additions and 2868 deletions
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
@ -2,44 +2,46 @@ package com.ruoyi.system.domain;

 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;

 /**
 * 参数配置表 sys_config
 *
- * @author ruoyi
+ * @author Lion Li
 */

@Data
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("sys_config")
@ExcelIgnoreUnannotated
-public class SysConfig implements Serializable {
-    private static final long serialVersionUID = 1L;
+@ApiModel("参数配置业务对象")
+public class SysConfig extends BaseEntity {

    /**
     * 参数主键
     */
+    @ApiModelProperty(value = "参数主键")
    @ExcelProperty(value = "参数主键")
-    @TableId(value = "config_id", type = IdType.AUTO)
+    @TableId(value = "config_id")
    private Long configId;

    /**
     * 参数名称
     */
+    @ApiModelProperty(value = "参数名称")
    @ExcelProperty(value = "参数名称")
    @NotBlank(message = "参数名称不能为空")
    @Size(min = 0, max = 100, message = "参数名称不能超过100个字符")
@ -48,6 +50,7 @@ public class SysConfig implements Serializable {
    /**
     * 参数键名
     */
+    @ApiModelProperty(value = "参数键名")
    @ExcelProperty(value = "参数键名")
    @NotBlank(message = "参数键名长度不能为空")
    @Size(min = 0, max = 100, message = "参数键名长度不能超过100个字符")
@ -56,6 +59,7 @@ public class SysConfig implements Serializable {
    /**
     * 参数键值
     */
+    @ApiModelProperty(value = "参数键值")
    @ExcelProperty(value = "参数键值")
    @NotBlank(message = "参数键值不能为空")
    @Size(min = 0, max = 500, message = "参数键值长度不能超过500个字符")
@ -64,43 +68,15 @@ public class SysConfig implements Serializable {
    /**
     * 系统内置（Y是 N否）
     */
+    @ApiModelProperty(value = "系统内置（Y是 N否）")
    @ExcelProperty(value = "系统内置", converter = ExcelDictConvert.class)
 	@ExcelDictFormat(dictType = "sys_yes_no")
    private String configType;

-    /**
-     * 创建者
-     */
-    @TableField(fill = FieldFill.INSERT)
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-
-    /**
-     * 更新者
-     */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Date updateTime;
-
    /**
     * 备注
     */
+    @ApiModelProperty(value = "备注")
    private String remark;

-    /**
-     * 请求参数
-     */
-    @TableField(exist = false)
-    private Map<String, Object> params = new HashMap<>();
-
 }
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java
@ -2,14 +2,14 @@ package com.ruoyi.system.domain;

 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;

 import java.io.Serializable;
@ -20,76 +20,86 @@ import java.util.Map;
 /**
 * 系统访问记录表 sys_logininfor
 *
- * @author ruoyi
+ * @author Lion Li
 */

@Data
-@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_logininfor")
@ExcelIgnoreUnannotated
+@ApiModel("系统访问记录业务对象")
 public class SysLogininfor implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
     * ID
     */
+    @ApiModelProperty(value = "访问ID")
    @ExcelProperty(value = "序号")
-    @TableId(value = "info_id", type = IdType.AUTO)
+    @TableId(value = "info_id")
    private Long infoId;

    /**
     * 用户账号
     */
+    @ApiModelProperty(value = "用户账号")
    @ExcelProperty(value = "用户账号")
    private String userName;

    /**
     * 登录状态 0成功 1失败
     */
+    @ApiModelProperty(value = "登录状态 0成功 1失败")
    @ExcelProperty(value = "登录状态", converter = ExcelDictConvert.class)
-	@ExcelDictFormat(dictType = "sys_common_status")
+    @ExcelDictFormat(dictType = "sys_common_status")
    private String status;

    /**
     * 登录IP地址
     */
+    @ApiModelProperty(value = "登录IP地址")
    @ExcelProperty(value = "登录地址")
    private String ipaddr;

    /**
     * 登录地点
     */
+    @ApiModelProperty(value = "登录地点")
    @ExcelProperty(value = "登录地点")
    private String loginLocation;

    /**
     * 浏览器类型
     */
+    @ApiModelProperty(value = "浏览器类型")
    @ExcelProperty(value = "浏览器")
    private String browser;

    /**
     * 操作系统
     */
+    @ApiModelProperty(value = "操作系统")
    @ExcelProperty(value = "操作系统")
    private String os;

    /**
     * 提示消息
     */
+    @ApiModelProperty(value = "提示消息")
    @ExcelProperty(value = "提示消息")
    private String msg;

    /**
     * 访问时间
     */
+    @ApiModelProperty(value = "访问时间")
    @ExcelProperty(value = "访问时间")
    private Date loginTime;

    /**
     * 请求参数
     */
+    @ApiModelProperty(value = "请求参数")
    @TableField(exist = false)
    private Map<String, Object> params = new HashMap<>();

--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
@ -1,39 +1,38 @@
 package com.ruoyi.system.domain;

-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;

 /**
 * 通知公告表 sys_notice
 *
- * @author ruoyi
+ * @author Lion Li
 */
@Data
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("sys_notice")
-public class SysNotice implements Serializable {
-    private static final long serialVersionUID = 1L;
+public class SysNotice extends BaseEntity {

    /**
     * 公告ID
     */
-    @TableId(value = "notice_id", type = IdType.AUTO)
+    @ApiModelProperty(value = "公告ID")
+    @TableId(value = "notice_id")
    private Long noticeId;

    /**
     * 公告标题
     */
+    @ApiModelProperty(value = "公告标题")
    @NotBlank(message = "公告标题不能为空")
    @Size(min = 0, max = 50, message = "公告标题不能超过50个字符")
    private String noticeTitle;
@ -41,53 +40,25 @@ public class SysNotice implements Serializable {
    /**
     * 公告类型（1通知 2公告）
     */
+    @ApiModelProperty(value = "公告类型（1通知 2公告）")
    private String noticeType;

    /**
     * 公告内容
     */
+    @ApiModelProperty(value = "公告内容")
    private String noticeContent;

    /**
     * 公告状态（0正常 1关闭）
     */
+    @ApiModelProperty(value = "公告状态（0正常 1关闭）")
    private String status;

-    /**
-     * 创建者
-     */
-    @TableField(fill = FieldFill.INSERT)
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    /**
-     * 更新者
-     */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
    /**
     * 备注
     */
+    @ApiModelProperty(value = "备注")
    private String remark;

-    /**
-     * 请求参数
-     */
-    @TableField(exist = false)
-    private Map<String, Object> params = new HashMap<>();
-
 }
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java
@ -2,14 +2,14 @@ package com.ruoyi.system.domain;

 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;

 import java.io.Serializable;
@ -20,33 +20,37 @@ import java.util.Map;
 /**
 * 操作日志记录表 oper_log
 *
- * @author ruoyi
+ * @author Lion Li
 */

@Data
-@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_oper_log")
@ExcelIgnoreUnannotated
+@ApiModel("操作日志记录业务对象")
 public class SysOperLog implements Serializable {
+
    private static final long serialVersionUID = 1L;

    /**
     * 日志主键
     */
-    @ExcelProperty(value = "操作序号")
-    @TableId(value = "oper_id", type = IdType.AUTO)
+    @ApiModelProperty(value = "日志主键")
+    @ExcelProperty(value = "日志主键")
+    @TableId(value = "oper_id")
    private Long operId;

    /**
     * 操作模块
     */
+    @ApiModelProperty(value = "操作模块")
    @ExcelProperty(value = "操作模块")
    private String title;

    /**
     * 业务类型（0其它 1新增 2修改 3删除）
     */
+    @ApiModelProperty(value = "业务类型（0其它 1新增 2修改 3删除）")
    @ExcelProperty(value = "业务类型", converter = ExcelDictConvert.class)
 	@ExcelDictFormat(dictType = "sys_oper_type")
    private Integer businessType;
@ -54,24 +58,28 @@ public class SysOperLog implements Serializable {
    /**
     * 业务类型数组
     */
+    @ApiModelProperty(value = "业务类型数组")
    @TableField(exist = false)
    private Integer[] businessTypes;

    /**
     * 请求方法
     */
+    @ApiModelProperty(value = "请求方法")
    @ExcelProperty(value = "请求方法")
    private String method;

    /**
     * 请求方式
     */
+    @ApiModelProperty(value = "请求方式")
    @ExcelProperty(value = "请求方式")
    private String requestMethod;

    /**
     * 操作类别（0其它 1后台用户 2手机端用户）
     */
+    @ApiModelProperty(value = "操作类别（0其它 1后台用户 2手机端用户）")
    @ExcelProperty(value = "操作类别", converter = ExcelDictConvert.class)
 	@ExcelDictFormat(readConverterExp = "0=其它,1=后台用户,2=手机端用户")
    private Integer operatorType;
@ -79,48 +87,56 @@ public class SysOperLog implements Serializable {
    /**
     * 操作人员
     */
+    @ApiModelProperty(value = "操作人员")
    @ExcelProperty(value = "操作人员")
    private String operName;

    /**
     * 部门名称
     */
+    @ApiModelProperty(value = "部门名称")
    @ExcelProperty(value = "部门名称")
    private String deptName;

    /**
     * 请求url
     */
+    @ApiModelProperty(value = "请求url")
    @ExcelProperty(value = "请求地址")
    private String operUrl;

    /**
     * 操作地址
     */
+    @ApiModelProperty(value = "操作地址")
    @ExcelProperty(value = "操作地址")
    private String operIp;

    /**
     * 操作地点
     */
+    @ApiModelProperty(value = "操作地点")
    @ExcelProperty(value = "操作地点")
    private String operLocation;

    /**
     * 请求参数
     */
+    @ApiModelProperty(value = "请求参数")
    @ExcelProperty(value = "请求参数")
    private String operParam;

    /**
     * 返回参数
     */
+    @ApiModelProperty(value = "返回参数")
    @ExcelProperty(value = "返回参数")
    private String jsonResult;

    /**
     * 操作状态（0正常 1异常）
     */
+    @ApiModelProperty(value = "操作状态（0正常 1异常）")
    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
 	@ExcelDictFormat(dictType = "sys_common_status")
    private Integer status;
@ -128,18 +144,21 @@ public class SysOperLog implements Serializable {
    /**
     * 错误消息
     */
+    @ApiModelProperty(value = "错误消息")
    @ExcelProperty(value = "错误消息")
    private String errorMsg;

    /**
     * 操作时间
     */
+    @ApiModelProperty(value = "操作时间")
    @ExcelProperty(value = "操作时间")
    private Date operTime;

    /**
     * 请求参数
     */
+    @ApiModelProperty(value = "请求参数")
    @TableField(exist = false)
    private Map<String, Object> params = new HashMap<>();

--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
@ -2,44 +2,47 @@ package com.ruoyi.system.domain;

 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;

 /**
 * 岗位表 sys_post
 *
- * @author ruoyi
+ * @author Lion Li
 */

@Data
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("sys_post")
@ExcelIgnoreUnannotated
-public class SysPost implements Serializable {
-    private static final long serialVersionUID = 1L;
+@ApiModel("岗位信息业务对象")
+public class SysPost extends BaseEntity {

    /**
     * 岗位序号
     */
+    @ApiModelProperty(value = "岗位序号")
    @ExcelProperty(value = "岗位序号")
-    @TableId(value = "post_id", type = IdType.AUTO)
+    @TableId(value = "post_id")
    private Long postId;

    /**
     * 岗位编码
     */
+    @ApiModelProperty(value = "岗位编码")
    @ExcelProperty(value = "岗位编码")
    @NotBlank(message = "岗位编码不能为空")
    @Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符")
@ -48,6 +51,7 @@ public class SysPost implements Serializable {
    /**
     * 岗位名称
     */
+    @ApiModelProperty(value = "岗位名称")
    @ExcelProperty(value = "岗位名称")
    @NotBlank(message = "岗位名称不能为空")
    @Size(min = 0, max = 50, message = "岗位名称长度不能超过50个字符")
@ -56,6 +60,7 @@ public class SysPost implements Serializable {
    /**
     * 岗位排序
     */
+    @ApiModelProperty(value = "岗位排序")
    @ExcelProperty(value = "岗位排序")
    @NotBlank(message = "显示顺序不能为空")
    private String postSort;
@ -63,48 +68,21 @@ public class SysPost implements Serializable {
    /**
     * 状态（0正常 1停用）
     */
+    @ApiModelProperty(value = "状态（0正常 1停用）")
 	@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
 	@ExcelDictFormat(dictType = "sys_common_status")
    private String status;

-    /**
-     * 创建者
-     */
-    @TableField(fill = FieldFill.INSERT)
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-
-    /**
-     * 更新者
-     */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Date updateTime;
-
    /**
     * 备注
     */
+    @ApiModelProperty(value = "备注")
    private String remark;

-    /**
-     * 请求参数
-     */
-    @TableField(exist = false)
-    private Map<String, Object> params = new HashMap<>();
-
    /**
     * 用户是否存在此岗位标识 默认不存在
     */
+    @ApiModelProperty(value = "用户是否存在此岗位标识 默认不存在")
    @TableField(exist = false)
    private boolean flag = false;

--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java
@ -1,29 +1,33 @@
 package com.ruoyi.system.domain;

 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;

 /**
 * 角色和部门关联 sys_role_dept
 *
- * @author ruoyi
+ * @author Lion Li
 */

@Data
-@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_role_dept")
+@ApiModel("角色和部门关联")
 public class SysRoleDept {
+
    /**
     * 角色ID
     */
+    @ApiModelProperty(value = "角色ID")
    private Long roleId;

    /**
     * 部门ID
     */
+    @ApiModelProperty(value = "部门ID")
    private Long deptId;

 }
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java
@ -1,29 +1,33 @@
 package com.ruoyi.system.domain;

 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;

 /**
 * 角色和菜单关联 sys_role_menu
 *
- * @author ruoyi
+ * @author Lion Li
 */

@Data
-@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_role_menu")
+@ApiModel("角色和菜单关联")
 public class SysRoleMenu {
+
    /**
     * 角色ID
     */
+    @ApiModelProperty(value = "角色ID")
    private Long roleId;

    /**
     * 菜单ID
     */
+    @ApiModelProperty(value = "角色ID")
    private Long menuId;

 }
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java
@ -1,56 +1,67 @@
 package com.ruoyi.system.domain;

-import lombok.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.experimental.Accessors;

 /**
 * 当前在线会话
 *
- * @author ruoyi
+ * @author Lion Li
 */

@Data
-@NoArgsConstructor
@Accessors(chain = true)
+@ApiModel("当前在线会话业务对象")
 public class SysUserOnline {
+
    /**
     * 会话编号
     */
+    @ApiModelProperty(value = "会话编号")
    private String tokenId;

    /**
     * 部门名称
     */
+    @ApiModelProperty(value = "部门名称")
    private String deptName;

    /**
     * 用户名称
     */
+    @ApiModelProperty(value = "用户名称")
    private String userName;

    /**
     * 登录IP地址
     */
+    @ApiModelProperty(value = "登录IP地址")
    private String ipaddr;

    /**
     * 登录地址
     */
+    @ApiModelProperty(value = "登录地址")
    private String loginLocation;

    /**
     * 浏览器类型
     */
+    @ApiModelProperty(value = "浏览器类型")
    private String browser;

    /**
     * 操作系统
     */
+    @ApiModelProperty(value = "操作系统")
    private String os;

    /**
     * 登录时间
     */
+    @ApiModelProperty(value = "登录时间")
    private Long loginTime;

 }
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java
@ -1,29 +1,33 @@
 package com.ruoyi.system.domain;

 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;

 /**
 * 用户和岗位关联 sys_user_post
 *
- * @author ruoyi
+ * @author Lion Li
 */

@Data
-@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_user_post")
+@ApiModel("用户和岗位关联")
 public class SysUserPost {
+
    /**
     * 用户ID
     */
+    @ApiModelProperty(value = "用户ID")
    private Long userId;

    /**
     * 岗位ID
     */
+    @ApiModelProperty(value = "岗位ID")
    private Long postId;

 }
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java
@ -1,29 +1,33 @@
 package com.ruoyi.system.domain;

 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;

 /**
 * 用户和角色关联 sys_user_role
 *
- * @author ruoyi
+ * @author Lion Li
 */

@Data
-@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_user_role")
+@ApiModel("用户和角色关联")
 public class SysUserRole {
+
    /**
     * 用户ID
     */
+    @ApiModelProperty(value = "用户ID")
    private Long userId;

    /**
     * 角色ID
     */
+    @ApiModelProperty(value = "角色ID")
    private Long roleId;

 }
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java
@ -16,52 +16,52 @@ import lombok.EqualsAndHashCode;
@ApiModel("OSS对象存储分页查询对象")
 public class SysOssBo extends BaseEntity {

-	/**
-	 * 分页大小
-	 */
-	@ApiModelProperty("分页大小")
-	private Integer pageSize;
-	/**
-	 * 当前页数
-	 */
-	@ApiModelProperty("当前页数")
-	private Integer pageNum;
-	/**
-	 * 排序列
-	 */
-	@ApiModelProperty("排序列")
-	private String orderByColumn;
-	/**
-	 * 排序的方向desc或者asc
-	 */
-	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
-	private String isAsc;
+    /**
+     * 分页大小
+     */
+    @ApiModelProperty("分页大小")
+    private Integer pageSize;
+    /**
+     * 当前页数
+     */
+    @ApiModelProperty("当前页数")
+    private Integer pageNum;
+    /**
+     * 排序列
+     */
+    @ApiModelProperty("排序列")
+    private String orderByColumn;
+    /**
+     * 排序的方向desc或者asc
+     */
+    @ApiModelProperty(value = "排序的方向", example = "asc,desc")
+    private String isAsc;


-	/**
-	 * 文件名
-	 */
-	@ApiModelProperty("文件名")
-	private String fileName;
-	/**
-	 * 原名
-	 */
-	@ApiModelProperty("原名")
-	private String originalName;
-	/**
-	 * 文件后缀名
-	 */
-	@ApiModelProperty("文件后缀名")
-	private String fileSuffix;
-	/**
-	 * URL地址
-	 */
-	@ApiModelProperty("URL地址")
-	private String url;
-	/**
-	 * 服务商
-	 */
-	@ApiModelProperty("服务商")
-	private String service;
+    /**
+     * 文件名
+     */
+    @ApiModelProperty("文件名")
+    private String fileName;
+    /**
+     * 原名
+     */
+    @ApiModelProperty("原名")
+    private String originalName;
+    /**
+     * 文件后缀名
+     */
+    @ApiModelProperty("文件后缀名")
+    private String fileSuffix;
+    /**
+     * URL地址
+     */
+    @ApiModelProperty("URL地址")
+    private String url;
+    /**
+     * 服务商
+     */
+    @ApiModelProperty("服务商")
+    private String service;

 }
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java
@ -25,43 +25,43 @@ import javax.validation.constraints.Size;
@ApiModel("对象存储配置业务对象")
 public class SysOssConfigBo extends BaseEntity {

-	/**
-	 * 主建
-	 */
-	@ApiModelProperty(value = "主建", required = true)
-	@NotNull(message = "主建不能为空", groups = { EditGroup.class })
-	private Long ossConfigId;
+    /**
+     * 主建
+     */
+    @ApiModelProperty(value = "主建", required = true)
+    @NotNull(message = "主建不能为空", groups = {EditGroup.class})
+    private Long ossConfigId;

    /**
     * 配置key
     */
    @ApiModelProperty(value = "configKey", required = true)
-    @NotBlank(message = "configKey不能为空", groups = { AddGroup.class, EditGroup.class })
-	@Size(min = 2, max = 100, message = "configKey长度必须介于2和20 之间")
+    @NotBlank(message = "configKey不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Size(min = 2, max = 100, message = "configKey长度必须介于2和20 之间")
    private String configKey;

    /**
     * accessKey
     */
    @ApiModelProperty(value = "accessKey", required = true)
-	@NotBlank(message = "accessKey不能为空", groups = { AddGroup.class, EditGroup.class })
-	@Size(min = 2, max = 100, message = "accessKey长度必须介于2和100 之间")
+    @NotBlank(message = "accessKey不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Size(min = 2, max = 100, message = "accessKey长度必须介于2和100 之间")
    private String accessKey;

    /**
     * 秘钥
     */
    @ApiModelProperty(value = "secretKey", required = true)
-	@NotBlank(message = "secretKey不能为空", groups = { AddGroup.class, EditGroup.class })
-	@Size(min = 2, max = 100, message = "secretKey长度必须介于2和100 之间")
+    @NotBlank(message = "secretKey不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Size(min = 2, max = 100, message = "secretKey长度必须介于2和100 之间")
    private String secretKey;

    /**
     * 桶名称
     */
    @ApiModelProperty(value = "bucketName", required = true)
-	@NotBlank(message = "bucketName不能为空", groups = { AddGroup.class, EditGroup.class })
-	@Size(min = 2, max = 100, message = "bucketName长度必须介于2和100之间")
+    @NotBlank(message = "bucketName不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Size(min = 2, max = 100, message = "bucketName长度必须介于2和100之间")
    private String bucketName;

    /**
@ -74,21 +74,21 @@ public class SysOssConfigBo extends BaseEntity {
     * 访问站点
     */
    @ApiModelProperty(value = "endpoint", required = true)
-	@NotBlank(message = "endpoint不能为空", groups = { AddGroup.class, EditGroup.class })
-	@Size(min = 2, max = 100, message = "endpoint长度必须介于2和100之间")
+    @NotBlank(message = "endpoint不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Size(min = 2, max = 100, message = "endpoint长度必须介于2和100之间")
    private String endpoint;

-	/**
-	 * 是否https（Y=是,N=否）
-	 */
-	@ApiModelProperty("是否https（Y=是,N=否）")
-	private String isHttps;
+    /**
+     * 是否https（Y=是,N=否）
+     */
+    @ApiModelProperty("是否https（Y=是,N=否）")
+    private String isHttps;

-	/**
-	 * 状态（0=正常,1=停用）
-	 */
-	@ApiModelProperty("状态（0=正常,1=停用）")
-	private String status;
+    /**
+     * 状态（0=正常,1=停用）
+     */
+    @ApiModelProperty("状态（0=正常,1=停用）")
+    private String status;

    /**
     * 域
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
@ -1,8 +1,9 @@
 package com.ruoyi.system.domain.vo;

 import com.ruoyi.common.utils.StringUtils;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;

 /**
@ -12,28 +13,33 @@ import lombok.experimental.Accessors;
 */

@Data
-@NoArgsConstructor
@Accessors(chain = true)
+@ApiModel("路由显示信息")
 public class MetaVo {
+
    /**
     * 设置该路由在侧边栏和面包屑中展示的名字
     */
+    @ApiModelProperty(value = "设置该路由在侧边栏和面包屑中展示的名字")
    private String title;

    /**
     * 设置该路由的图标，对应路径src/assets/icons/svg
     */
+    @ApiModelProperty(value = "设置该路由的图标，对应路径src/assets/icons/svg")
    private String icon;

    /**
     * 设置为true，则不会被 <keep-alive>缓存
     */
+    @ApiModelProperty(value = "设置为true，则不会被 <keep-alive>缓存")
    private boolean noCache;

-	/**
-	 * 内链地址（http(s)://开头）
-	 */
-	private String link;
+    /**
+     * 内链地址（http(s)://开头）
+     */
+    @ApiModelProperty(value = "内链地址（http(s)://开头）")
+    private String link;

    public MetaVo(String title, String icon) {
        this.title = title;
@ -46,19 +52,19 @@ public class MetaVo {
        this.noCache = noCache;
    }

-	public MetaVo(String title, String icon, String link) {
-		this.title = title;
-		this.icon = icon;
-		this.link = link;
-	}
+    public MetaVo(String title, String icon, String link) {
+        this.title = title;
+        this.icon = icon;
+        this.link = link;
+    }

-	public MetaVo(String title, String icon, boolean noCache, String link) {
-		this.title = title;
-		this.icon = icon;
-		this.noCache = noCache;
-		if (StringUtils.ishttp(link)) {
-			this.link = link;
-		}
-	}
+    public MetaVo(String title, String icon, boolean noCache, String link) {
+        this.title = title;
+        this.icon = icon;
+        this.noCache = noCache;
+        if (StringUtils.ishttp(link)) {
+            this.link = link;
+        }
+    }

 }
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java
@ -1,7 +1,9 @@
 package com.ruoyi.system.domain.vo;

 import com.fasterxml.jackson.annotation.JsonInclude;
-import lombok.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.experimental.Accessors;

 import java.util.List;
@ -9,56 +11,66 @@ import java.util.List;
 /**
 * 路由配置信息
 *
- * @author ruoyi
+ * @author Lion Li
 */
@Data
-@NoArgsConstructor
@Accessors(chain = true)
@JsonInclude(JsonInclude.Include.NON_EMPTY)
+@ApiModel("路由配置信息")
 public class RouterVo {
+
    /**
     * 路由名字
     */
+    @ApiModelProperty(value = "路由名字")
    private String name;

    /**
     * 路由地址
     */
+    @ApiModelProperty(value = "路由地址")
    private String path;

    /**
     * 是否隐藏路由，当设置 true 的时候该路由不会再侧边栏出现
     */
+    @ApiModelProperty(value = "是否隐藏路由，当设置 true 的时候该路由不会再侧边栏出现")
    private boolean hidden;

    /**
     * 重定向地址，当设置 noRedirect 的时候该路由在面包屑导航中不可被点击
     */
+    @ApiModelProperty(value = "重定向地址，当设置 noRedirect 的时候该路由在面包屑导航中不可被点击")
    private String redirect;

    /**
     * 组件地址
     */
+    @ApiModelProperty(value = "组件地址")
    private String component;

    /**
     * 路由参数：如 {"id": 1, "name": "ry"}
     */
+    @ApiModelProperty(value = "路由参数：如 {\"id\": 1, \"name\": \"ry\"}")
    private String query;

    /**
     * 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面
     */
+    @ApiModelProperty(value = "当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面")
    private Boolean alwaysShow;

    /**
     * 其他元素
     */
+    @ApiModelProperty(value = "其他元素")
    private MetaVo meta;

    /**
     * 子路由
     */
+    @ApiModelProperty(value = "子路由")
    private List<RouterVo> children;

 }
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java
@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;


-
 /**
 * 对象存储配置视图对象 sys_oss_config
 *
@ -19,78 +18,78 @@ import lombok.Data;
@ExcelIgnoreUnannotated
 public class SysOssConfigVo {

-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;

-	/**
+    /**
     * 主建
     */
-	@ApiModelProperty("主建")
-	private Long ossConfigId;
+    @ApiModelProperty("主建")
+    private Long ossConfigId;

    /**
     * 配置key
     */
-	@ApiModelProperty("配置key")
-	private String configKey;
+    @ApiModelProperty("配置key")
+    private String configKey;

    /**
     * accessKey
     */
-	@ApiModelProperty("accessKey")
-	private String accessKey;
+    @ApiModelProperty("accessKey")
+    private String accessKey;

    /**
     * 秘钥
     */
-	@ApiModelProperty("secretKey")
-	private String secretKey;
+    @ApiModelProperty("secretKey")
+    private String secretKey;

    /**
     * 桶名称
     */
-	@ApiModelProperty("桶名称")
-	private String bucketName;
+    @ApiModelProperty("桶名称")
+    private String bucketName;

    /**
     * 前缀
     */
-	@ApiModelProperty("前缀")
-	private String prefix;
+    @ApiModelProperty("前缀")
+    private String prefix;

    /**
     * 访问站点
     */
-	@ApiModelProperty("访问站点")
-	private String endpoint;
+    @ApiModelProperty("访问站点")
+    private String endpoint;

    /**
     * 是否https（Y=是,N=否）
     */
-	@ApiModelProperty("是否https（Y=是,N=否）")
-	private String isHttps;
+    @ApiModelProperty("是否https（Y=是,N=否）")
+    private String isHttps;

    /**
     * 域
     */
-	@ApiModelProperty("域")
-	private String region;
+    @ApiModelProperty("域")
+    private String region;

    /**
     * 状态（0=正常,1=停用）
     */
-	@ApiModelProperty("状态（0=正常,1=停用）")
-	private String status;
+    @ApiModelProperty("状态（0=正常,1=停用）")
+    private String status;

    /**
     * 扩展字段
     */
-	@ApiModelProperty("扩展字段")
-	private String ext1;
+    @ApiModelProperty("扩展字段")
+    private String ext1;

-	/**
-	 * 备注
-	 */
-	@ApiModelProperty("备注")
-	private String remark;
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    private String remark;

 }
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java
@ -15,55 +15,55 @@ import java.util.Date;
@ApiModel("OSS对象存储视图对象")
 public class SysOssVo {

-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;

-	/**
-	 *  对象存储主键
-	 */
-	@ApiModelProperty("对象存储主键")
-	private Long ossId;
+    /**
+     * 对象存储主键
+     */
+    @ApiModelProperty("对象存储主键")
+    private Long ossId;

-	/**
-	 * 文件名
-	 */
-	@ApiModelProperty("文件名")
-	private String fileName;
+    /**
+     * 文件名
+     */
+    @ApiModelProperty("文件名")
+    private String fileName;

-	/**
-	 * 原名
-	 */
-	@ApiModelProperty("原名")
-	private String originalName;
+    /**
+     * 原名
+     */
+    @ApiModelProperty("原名")
+    private String originalName;

-	/**
-	 * 文件后缀名
-	 */
-	@ApiModelProperty("文件后缀名")
-	private String fileSuffix;
+    /**
+     * 文件后缀名
+     */
+    @ApiModelProperty("文件后缀名")
+    private String fileSuffix;

-	/**
-	 * URL地址
-	 */
-	@ApiModelProperty("URL地址")
-	private String url;
+    /**
+     * URL地址
+     */
+    @ApiModelProperty("URL地址")
+    private String url;

-	/**
-	 * 创建时间
-	 */
-	@ApiModelProperty("创建时间")
-	private Date createTime;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    private Date createTime;

-	/**
-	 * 上传人
-	 */
-	@ApiModelProperty("上传人")
-	private String createBy;
+    /**
+     * 上传人
+     */
+    @ApiModelProperty("上传人")
+    private String createBy;

-	/**
-	 * 服务商
-	 */
-	@ApiModelProperty("服务商")
-	private String service;
+    /**
+     * 服务商
+     */
+    @ApiModelProperty("服务商")
+    private String service;


 }
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java
@ -20,74 +20,74 @@ import java.util.Date;
@NoArgsConstructor
@Accessors(chain = true)
 public class SysUserExportVo implements Serializable {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;

-	/**
-	 * 用户ID
-	 */
-	@ExcelProperty(value = "用户序号")
-	private Long userId;
+    /**
+     * 用户ID
+     */
+    @ExcelProperty(value = "用户序号")
+    private Long userId;

-	/**
-	 * 用户账号
-	 */
-	@ExcelProperty(value = "登录名称")
-	private String userName;
+    /**
+     * 用户账号
+     */
+    @ExcelProperty(value = "登录名称")
+    private String userName;

-	/**
-	 * 用户昵称
-	 */
-	@ExcelProperty(value = "用户名称")
-	private String nickName;
+    /**
+     * 用户昵称
+     */
+    @ExcelProperty(value = "用户名称")
+    private String nickName;

-	/**
-	 * 用户邮箱
-	 */
-	@ExcelProperty(value = "用户邮箱")
-	private String email;
+    /**
+     * 用户邮箱
+     */
+    @ExcelProperty(value = "用户邮箱")
+    private String email;

-	/**
-	 * 手机号码
-	 */
-	@ExcelProperty(value = "手机号码")
-	private String phonenumber;
+    /**
+     * 手机号码
+     */
+    @ExcelProperty(value = "手机号码")
+    private String phonenumber;

-	/**
-	 * 用户性别
-	 */
-	@ExcelProperty(value = "用户性别", converter = ExcelDictConvert.class)
-	@ExcelDictFormat(dictType = "sys_user_sex")
-	private String sex;
+    /**
+     * 用户性别
+     */
+    @ExcelProperty(value = "用户性别", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_user_sex")
+    private String sex;

-	/**
-	 * 帐号状态（0正常 1停用）
-	 */
-	@ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class)
-	@ExcelDictFormat(dictType = "sys_common_status")
-	private String status;
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    @ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_common_status")
+    private String status;

-	/**
-	 * 最后登录IP
-	 */
-	@ExcelProperty(value = "最后登录IP")
-	private String loginIp;
+    /**
+     * 最后登录IP
+     */
+    @ExcelProperty(value = "最后登录IP")
+    private String loginIp;

-	/**
-	 * 最后登录时间
-	 */
-	@ExcelProperty(value = "最后登录时间")
-	private Date loginDate;
+    /**
+     * 最后登录时间
+     */
+    @ExcelProperty(value = "最后登录时间")
+    private Date loginDate;

-	/**
-	 * 部门名称
-	 */
-	@ExcelProperty(value = "部门名称")
-	private String deptName;
+    /**
+     * 部门名称
+     */
+    @ExcelProperty(value = "部门名称")
+    private String deptName;

-	/**
-	 * 负责人
-	 */
-	@ExcelProperty(value = "部门负责人")
-	private String leader;
+    /**
+     * 负责人
+     */
+    @ExcelProperty(value = "部门负责人")
+    private String leader;

 }
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java
@ -18,56 +18,56 @@ import java.io.Serializable;
@NoArgsConstructor
 // @Accessors(chain = true) // 导入不允许使用 会找不到set方法
 public class SysUserImportVo implements Serializable {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;

-	/**
-	 * 用户ID
-	 */
-	@ExcelProperty(value = "用户序号")
-	private Long userId;
+    /**
+     * 用户ID
+     */
+    @ExcelProperty(value = "用户序号")
+    private Long userId;

-	/**
-	 * 部门ID
-	 */
-	@ExcelProperty(value = "部门编号")
-	private Long deptId;
+    /**
+     * 部门ID
+     */
+    @ExcelProperty(value = "部门编号")
+    private Long deptId;

-	/**
-	 * 用户账号
-	 */
-	@ExcelProperty(value = "登录名称")
-	private String userName;
+    /**
+     * 用户账号
+     */
+    @ExcelProperty(value = "登录名称")
+    private String userName;

-	/**
-	 * 用户昵称
-	 */
-	@ExcelProperty(value = "用户名称")
-	private String nickName;
+    /**
+     * 用户昵称
+     */
+    @ExcelProperty(value = "用户名称")
+    private String nickName;

-	/**
-	 * 用户邮箱
-	 */
-	@ExcelProperty(value = "用户邮箱")
-	private String email;
+    /**
+     * 用户邮箱
+     */
+    @ExcelProperty(value = "用户邮箱")
+    private String email;

-	/**
-	 * 手机号码
-	 */
-	@ExcelProperty(value = "手机号码")
-	private String phonenumber;
+    /**
+     * 手机号码
+     */
+    @ExcelProperty(value = "手机号码")
+    private String phonenumber;

-	/**
-	 * 用户性别
-	 */
-	@ExcelProperty(value = "用户性别", converter = ExcelDictConvert.class)
-	@ExcelDictFormat(dictType = "sys_user_sex")
-	private String sex;
+    /**
+     * 用户性别
+     */
+    @ExcelProperty(value = "用户性别", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_user_sex")
+    private String sex;

-	/**
-	 * 帐号状态（0正常 1停用）
-	 */
-	@ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class)
-	@ExcelDictFormat(dictType = "sys_common_status")
-	private String status;
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    @ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_common_status")
+    private String status;

 }