对齐 boot 与 cloud 的代码

YunaiV
1 parent 114f1e48
Showing 88 changed files with 156 additions and 151 deletions
yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/column/CodegenColumnBaseVO.java
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTablePageReqVO.java
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigExportReqVO.java
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigPageReqVO.java
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigRespVO.java
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigCreateReqVO.java
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigRespVO.java
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FilePageReqVO.java
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/job/JobPageReqVO.java
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/log/JobLogBaseVO.java
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/log/JobLogExportReqVO.java
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/log/JobLogPageReqVO.java
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogBaseVO.java
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogExportReqVO.java
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/logger/vo/apiaccesslog/ApiAccessLogPageReqVO.java
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/vo/AppAuthLoginReqVO.java
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/vo/AppAuthSmsLoginReqVO.java
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/vo/AppAuthSocialLoginReqVO.java
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/social/vo/AppSocialUserBindReqVO.java
@@ -21,6 +21,7 @@ public class YudaoJacksonAutoConfiguration {
     @Bean
     public BeanPostProcessor objectMapperBeanPostProcessor() {
         return new BeanPostProcessor() {
+
             @Override
             public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
                 if (!(bean instanceof ObjectMapper)) {
@@ -70,7 +70,7 @@ public class CodegenColumnBaseVO {
     @NotNull(message = "是否为 List 查询操作的字段不能为空")
     private Boolean listOperation;
  
-    @Schema(description = "List 查询操作的条件类型,参见 CodegenColumnListConditionEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "LIKE")
+    @Schema(description = "List 查询操作的条件类型，参见 CodegenColumnListConditionEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "LIKE")
     @NotNull(message = "List 查询操作的条件类型不能为空")
     private String listOperationCondition;
  
@@ -17,13 +17,13 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @ToString(callSuper = true)
 public class CodegenTablePageReqVO extends PageParam {
  
-    @Schema(description = "表名称,模糊匹配", example = "yudao")
+    @Schema(description = "表名称，模糊匹配", example = "yudao")
     private String tableName;
  
-    @Schema(description = "表描述,模糊匹配", example = "芋道")
+    @Schema(description = "表描述，模糊匹配", example = "芋道")
     private String tableComment;
  
-    @Schema(description = "实体,模糊匹配", example = "Yudao")
+    @Schema(description = "实体，模糊匹配", example = "Yudao")
     private String className;
  
     @Schema(description = "创建时间", example = "[2022-07-01 00:00:00,2022-07-01 23:59:59]")
@@ -15,10 +15,10 @@ public class ConfigExportReqVO {
     @Schema(description = "参数名称", example = "模糊匹配")
     private String name;
  
-    @Schema(description = "参数键名,模糊匹配", example = "yunai.db.username")
+    @Schema(description = "参数键名，模糊匹配", example = "yunai.db.username")
     private String key;
  
-    @Schema(description = "参数类型,参见 SysConfigTypeEnum 枚举", example = "1")
+    @Schema(description = "参数类型，参见 SysConfigTypeEnum 枚举", example = "1")
     private Integer type;
  
     @Schema(description = "创建时间", example = "[2022-07-01 00:00:00,2022-07-01 23:59:59]")
@@ -17,13 +17,13 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @ToString(callSuper = true)
 public class ConfigPageReqVO extends PageParam {
  
-    @Schema(description = "数据源名称,模糊匹配", example = "名称")
+    @Schema(description = "数据源名称，模糊匹配", example = "名称")
     private String name;
  
-    @Schema(description = "参数键名,模糊匹配", example = "yunai.db.username")
+    @Schema(description = "参数键名，模糊匹配", example = "yunai.db.username")
     private String key;
  
-    @Schema(description = "参数类型,参见 SysConfigTypeEnum 枚举", example = "1")
+    @Schema(description = "参数类型，参见 SysConfigTypeEnum 枚举", example = "1")
     private Integer type;
  
     @Schema(description = "创建时间", example = "[2022-07-01 00:00:00,2022-07-01 23:59:59]")
@@ -21,7 +21,7 @@ public class ConfigRespVO extends ConfigBaseVO {
     @Size(max = 100, message = "参数键名长度不能超过100个字符")
     private String key;
  
-    @Schema(description = "参数类型,参见 SysConfigTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "参数类型，参见 SysConfigTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Integer type;
  
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式")
@@ -14,7 +14,7 @@ import java.util.Map;
 @ToString(callSuper = true)
 public class FileConfigCreateReqVO extends FileConfigBaseVO {
  
-    @Schema(description = "存储器,参见 FileStorageEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "存储器，参见 FileStorageEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "存储器不能为空")
     private Integer storage;
  
@@ -18,7 +18,7 @@ public class FileConfigRespVO extends FileConfigBaseVO {
     @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Long id;
  
-    @Schema(description = "存储器,参见 FileStorageEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "存储器，参见 FileStorageEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "存储器不能为空")
     private Integer storage;
  
@@ -17,10 +17,10 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @ToString(callSuper = true)
 public class FilePageReqVO extends PageParam {
  
-    @Schema(description = "文件路径,模糊匹配", example = "yudao")
+    @Schema(description = "文件路径，模糊匹配", example = "yudao")
     private String path;
  
-    @Schema(description = "文件类型,模糊匹配", example = "jpg")
+    @Schema(description = "文件类型，模糊匹配", example = "jpg")
     private String type;
  
     @Schema(description = "创建时间", example = "[2022-07-01 00:00:00, 2022-07-01 23:59:59]")
@@ -12,13 +12,13 @@ import lombok.ToString;
 @ToString(callSuper = true)
 public class JobPageReqVO extends PageParam {
  
-    @Schema(description = "任务名称,模糊匹配", example = "测试任务")
+    @Schema(description = "任务名称，模糊匹配", example = "测试任务")
     private String name;
  
-    @Schema(description = "任务状态,参见 JobStatusEnum 枚举", example = "1")
+    @Schema(description = "任务状态，参见 JobStatusEnum 枚举", example = "1")
     private Integer status;
  
-    @Schema(description = "处理器的名字,模糊匹配", example = "sysUserSessionTimeoutJob")
+    @Schema(description = "处理器的名字，模糊匹配", example = "sysUserSessionTimeoutJob")
     private String handlerName;
  
 }
@@ -43,7 +43,7 @@ public class JobLogBaseVO {
     @Schema(description = "执行时长", example = "123")
     private Integer duration;
  
-    @Schema(description = "任务状态,参见 JobLogStatusEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "任务状态，参见 JobLogStatusEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "任务状态不能为空")
     private Integer status;
  
@@ -15,7 +15,7 @@ public class JobLogExportReqVO {
     @Schema(description = "任务编号", example = "10")
     private Long jobId;
  
-    @Schema(description = "处理器的名字,模糊匹配")
+    @Schema(description = "处理器的名字，模糊匹配")
     private String handlerName;
  
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@@ -26,7 +26,7 @@ public class JobLogExportReqVO {
     @Schema(description = "结束执行时间")
     private LocalDateTime endTime;
  
-    @Schema(description = "任务状态,参见 JobLogStatusEnum 枚举")
+    @Schema(description = "任务状态，参见 JobLogStatusEnum 枚举")
     private Integer status;
  
 }
@@ -20,7 +20,7 @@ public class JobLogPageReqVO extends PageParam {
     @Schema(description = "任务编号", example = "10")
     private Long jobId;
  
-    @Schema(description = "处理器的名字,模糊匹配")
+    @Schema(description = "处理器的名字，模糊匹配")
     private String handlerName;
  
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@@ -31,7 +31,7 @@ public class JobLogPageReqVO extends PageParam {
     @Schema(description = "结束执行时间")
     private LocalDateTime endTime;
  
-    @Schema(description = "任务状态,参见 JobLogStatusEnum 枚举")
+    @Schema(description = "任务状态，参见 JobLogStatusEnum 枚举")
     private Integer status;
  
 }
@@ -24,7 +24,7 @@ public class ApiAccessLogBaseVO {
     @NotNull(message = "用户编号不能为空")
     private Long userId;
  
-    @Schema(description = "用户类型,参见 UserTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Schema(description = "用户类型，参见 UserTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @NotNull(message = "用户类型不能为空")
     private Integer userType;
  
@@ -21,7 +21,7 @@ public class ApiAccessLogExportReqVO {
     @Schema(description = "应用名", example = "dashboard")
     private String applicationName;
  
-    @Schema(description = "请求地址,模糊匹配", example = "/xxx/yyy")
+    @Schema(description = "请求地址，模糊匹配", example = "/xxx/yyy")
     private String requestUrl;
  
     @Schema(description = "开始时间", example = "[2022-07-01 00:00:00, 2022-07-01 23:59:59]")
@@ -26,7 +26,7 @@ public class ApiAccessLogPageReqVO extends PageParam {
     @Schema(description = "应用名", example = "dashboard")
     private String applicationName;
  
-    @Schema(description = "请求地址,模糊匹配", example = "/xxx/yyy")
+    @Schema(description = "请求地址，模糊匹配", example = "/xxx/yyy")
     private String requestUrl;
  
     @Schema(description = "开始时间", example = "[2022-07-01 00:00:00, 2022-07-01 23:59:59]")
@@ -33,7 +33,7 @@ public class AppAuthLoginReqVO {
  
     // ========== 绑定社交登录时，需要传递如下参数 ==========
  
-    @Schema(description = "社交平台的类型,参见 SysUserSocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
+    @Schema(description = "社交平台的类型，参见 SysUserSocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
     @InEnum(SocialTypeEnum.class)
     private Integer socialType;
  
@@ -35,7 +35,7 @@ public class AppAuthSmsLoginReqVO {
  
     // ========== 绑定社交登录时，需要传递如下参数 ==========
  
-    @Schema(description = "社交平台的类型,参见 SysUserSocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
+    @Schema(description = "社交平台的类型，参见 SysUserSocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
     @InEnum(SocialTypeEnum.class)
     private Integer socialType;
  
@@ -18,7 +18,7 @@ import javax.validation.constraints.NotNull;
 @Builder
 public class AppAuthSocialLoginReqVO {
  
-    @Schema(description = "社交平台的类型,参见 SysUserSocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
+    @Schema(description = "社交平台的类型，参见 SysUserSocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
     @InEnum(SocialTypeEnum.class)
     @NotNull(message = "社交平台的类型不能为空")
     private Integer type;
@@ -18,7 +18,7 @@ import javax.validation.constraints.NotNull;
 @Builder
 public class AppSocialUserBindReqVO {
  
-    @Schema(description = "社交平台的类型,参见 SysUserSocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
+    @Schema(description = "社交平台的类型，参见 SysUserSocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
     @InEnum(SocialTypeEnum.class)
     @NotNull(message = "社交平台的类型不能为空")
     private Integer type;
@@ -18,7 +18,7 @@ import javax.validation.constraints.NotNull;
 @Builder
 public class AppSocialUserUnbindReqVO {
  
-    @Schema(description = "社交平台的类型,参见 SysUserSocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
+    @Schema(description = "社交平台的类型，参见 SysUserSocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
     @InEnum(SocialTypeEnum.class)
     @NotNull(message = "社交平台的类型不能为空")
     private Integer type;
@@ -55,6 +55,7 @@ public class AuthController {
     private PermissionService permissionService;
     @Resource
     private SocialUserService socialUserService;
+
     @Resource
     private SecurityProperties securityProperties;
  
@@ -18,7 +18,7 @@ import javax.validation.constraints.NotNull;
 @Builder
 public class AuthSocialLoginReqVO {
  
-    @Schema(description = "社交平台的类型,参见 UserSocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
+    @Schema(description = "社交平台的类型，参见 UserSocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
     @InEnum(SocialTypeEnum.class)
     @NotNull(message = "社交平台的类型不能为空")
     private Integer type;
@@ -7,10 +7,10 @@ import lombok.Data;
 @Data
 public class DeptListReqVO {
  
-    @Schema(description = "部门名称,模糊匹配", example = "芋道")
+    @Schema(description = "部门名称，模糊匹配", example = "芋道")
     private String name;
  
-    @Schema(description = "展示状态,参见 CommonStatusEnum 枚举类", example = "1")
+    @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1")
     private Integer status;
  
 }
@@ -14,7 +14,7 @@ public class DeptRespVO extends DeptBaseVO {
     @Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long id;
  
-    @Schema(description = "状态,参见 CommonStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "状态，参见 CommonStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Integer status;
  
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式")
@@ -27,7 +27,7 @@ public class PostBaseVO {
     @NotNull(message = "显示顺序不能为空")
     private Integer sort;
  
-    @Schema(description = "状态,参见 CommonStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "状态，参见 CommonStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Integer status;
  
     @Schema(description = "备注", example = "快乐的备注")
@@ -7,13 +7,13 @@ import lombok.Data;
 @Data
 public class PostExportReqVO {
  
-    @Schema(description = "岗位编码,模糊匹配", example = "yudao")
+    @Schema(description = "岗位编码，模糊匹配", example = "yudao")
     private String code;
  
-    @Schema(description = "岗位名称,模糊匹配", example = "芋道")
+    @Schema(description = "岗位名称，模糊匹配", example = "芋道")
     private String name;
  
-    @Schema(description = "展示状态,参见 CommonStatusEnum 枚举类", example = "1")
+    @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1")
     private Integer status;
  
 }
@@ -9,10 +9,10 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class PostListReqVO extends PostBaseVO {
  
-    @Schema(description = "岗位名称,模糊匹配", example = "芋道")
+    @Schema(description = "岗位名称，模糊匹配", example = "芋道")
     private String name;
  
-    @Schema(description = "展示状态,参见 CommonStatusEnum 枚举类", example = "1")
+    @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1")
     private Integer status;
  
 }
@@ -10,13 +10,13 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class PostPageReqVO extends PageParam {
  
-    @Schema(description = "岗位编码,模糊匹配", example = "yudao")
+    @Schema(description = "岗位编码，模糊匹配", example = "yudao")
     private String code;
  
-    @Schema(description = "岗位名称,模糊匹配", example = "芋道")
+    @Schema(description = "岗位名称，模糊匹配", example = "芋道")
     private String name;
  
-    @Schema(description = "展示状态,参见 CommonStatusEnum 枚举类", example = "1")
+    @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1")
     private Integer status;
  
 }
@@ -13,11 +13,11 @@ public class DictDataExportReqVO {
     @Size(max = 100, message = "字典标签长度不能超过100个字符")
     private String label;
  
-    @Schema(description = "字典类型,模糊匹配", example = "sys_common_sex")
+    @Schema(description = "字典类型，模糊匹配", example = "sys_common_sex")
     @Size(max = 100, message = "字典类型类型长度不能超过100个字符")
     private String dictType;
  
-    @Schema(description = "展示状态,参见 CommonStatusEnum 枚举类", example = "1")
+    @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1")
     private Integer status;
  
 }
@@ -16,11 +16,11 @@ public class DictDataPageReqVO extends PageParam {
     @Size(max = 100, message = "字典标签长度不能超过100个字符")
     private String label;
  
-    @Schema(description = "字典类型,模糊匹配", example = "sys_common_sex")
+    @Schema(description = "字典类型，模糊匹配", example = "sys_common_sex")
     @Size(max = 100, message = "字典类型类型长度不能超过100个字符")
     private String dictType;
  
-    @Schema(description = "展示状态,参见 CommonStatusEnum 枚举类", example = "1")
+    @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1")
     private Integer status;
  
 }
@@ -16,8 +16,9 @@ public class DictDataSimpleRespVO {
     @Schema(description = "字典标签", requiredMode = Schema.RequiredMode.REQUIRED, example = "男")
     private String label;
  
-    @Schema(description = "颜色类型,default、primary、success、info、warning、danger", example = "default")
+    @Schema(description = "颜色类型，default、primary、success、info、warning、danger", example = "default")
     private String colorType;
+
     @Schema(description = "css 样式", example = "btn-visible")
     private String cssClass;
  
@@ -19,7 +19,7 @@ public class DictTypeBaseVO {
     @Size(max = 100, message = "字典类型名称长度不能超过100个字符")
     private String name;
  
-    @Schema(description = "状态,参见 CommonStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "状态，参见 CommonStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "状态不能为空")
     private Integer status;
  
@@ -12,13 +12,13 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @Data
 public class DictTypeExportReqVO {
  
-    @Schema(description = "字典类型名称,模糊匹配", example = "芋道")
+    @Schema(description = "字典类型名称，模糊匹配", example = "芋道")
     private String name;
  
-    @Schema(description = "字典类型,模糊匹配", example = "sys_common_sex")
+    @Schema(description = "字典类型，模糊匹配", example = "sys_common_sex")
     private String type;
  
-    @Schema(description = "展示状态,参见 CommonStatusEnum 枚举类", example = "1")
+    @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1")
     private Integer status;
  
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@@ -16,14 +16,14 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @EqualsAndHashCode(callSuper = true)
 public class DictTypePageReqVO extends PageParam {
  
-    @Schema(description = "字典类型名称,模糊匹配", example = "芋道")
+    @Schema(description = "字典类型名称，模糊匹配", example = "芋道")
     private String name;
  
-    @Schema(description = "字典类型,模糊匹配", example = "sys_common_sex")
+    @Schema(description = "字典类型，模糊匹配", example = "sys_common_sex")
     @Size(max = 100, message = "字典类型类型长度不能超过100个字符")
     private String type;
  
-    @Schema(description = "展示状态,参见 CommonStatusEnum 枚举类", example = "1")
+    @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1")
     private Integer status;
  
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@@ -17,7 +17,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @ToString(callSuper = true)
 public class ErrorCodePageReqVO extends PageParam {
  
-    @Schema(description = "错误码类型,参见 ErrorCodeTypeEnum 枚举类", example = "1")
+    @Schema(description = "错误码类型，参见 ErrorCodeTypeEnum 枚举类", example = "1")
     private Integer type;
  
     @Schema(description = "应用名", example = "dashboard")
@@ -16,7 +16,7 @@ public class ErrorCodeRespVO extends ErrorCodeBaseVO {
     @Schema(description = "错误码编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long id;
  
-    @Schema(description = "错误码类型,参见 ErrorCodeTypeEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "错误码类型，参见 ErrorCodeTypeEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Integer type;
  
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -15,7 +15,7 @@ import javax.validation.constraints.Size;
 @Data
 public class LoginLogBaseVO {
  
-    @Schema(description = "日志类型,参见 LoginLogTypeEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "日志类型，参见 LoginLogTypeEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "日志类型不能为空")
     private Integer logType;
  
@@ -28,7 +28,7 @@ public class LoginLogBaseVO {
     @Size(max = 30, message = "用户账号长度不能超过30个字符")
     private String username;
  
-    @Schema(description = "登录结果,参见 LoginResultEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "登录结果，参见 LoginResultEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "登录结果不能为空")
     private Integer result;
  
@@ -12,10 +12,10 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @Data
 public class LoginLogExportReqVO {
  
-    @Schema(description = "用户 IP,模拟匹配", example = "127.0.0.1")
+    @Schema(description = "用户 IP，模拟匹配", example = "127.0.0.1")
     private String userIp;
  
-    @Schema(description = "用户账号,模拟匹配", example = "芋道")
+    @Schema(description = "用户账号，模拟匹配", example = "芋道")
     private String username;
  
     @Schema(description = "操作状态", example = "true")
@@ -15,10 +15,10 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @EqualsAndHashCode(callSuper = true)
 public class LoginLogPageReqVO extends PageParam {
  
-    @Schema(description = "用户 IP,模拟匹配", example = "127.0.0.1")
+    @Schema(description = "用户 IP，模拟匹配", example = "127.0.0.1")
     private String userIp;
  
-    @Schema(description = "用户账号,模拟匹配", example = "芋道")
+    @Schema(description = "用户账号，模拟匹配", example = "芋道")
     private String username;
  
     @Schema(description = "操作状态", example = "true")
@@ -20,7 +20,7 @@ public class LoginLogRespVO extends LoginLogBaseVO {
     @Schema(description = "用户编号", example = "666")
     private Long userId;
  
-    @Schema(description = "用户类型,参见 UserTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Schema(description = "用户类型，参见 UserTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @NotNull(message = "用户类型不能为空")
     private Integer userType;
  
@@ -31,7 +31,7 @@ public class OperateLogBaseVO {
     @NotEmpty(message = "操作名")
     private String name;
  
-    @Schema(description = "操作分类,参见 OperateLogTypeEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "操作分类，参见 OperateLogTypeEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "操作分类不能为空")
     private Integer type;
  
@@ -12,13 +12,13 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @Data
 public class OperateLogExportReqVO {
  
-    @Schema(description = "操作模块,模拟匹配", example = "订单")
+    @Schema(description = "操作模块，模拟匹配", example = "订单")
     private String module;
  
-    @Schema(description = "用户昵称,模拟匹配", example = "芋道")
+    @Schema(description = "用户昵称，模拟匹配", example = "芋道")
     private String userNickname;
  
-    @Schema(description = "操作分类,参见 OperateLogTypeEnum 枚举类", example = "1")
+    @Schema(description = "操作分类，参见 OperateLogTypeEnum 枚举类", example = "1")
     private Integer type;
  
     @Schema(description = "操作状态", example = "true")
@@ -13,13 +13,13 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @Data
 public class OperateLogPageReqVO extends PageParam {
  
-    @Schema(description = "操作模块,模拟匹配", example = "订单")
+    @Schema(description = "操作模块，模拟匹配", example = "订单")
     private String module;
  
-    @Schema(description = "用户昵称,模拟匹配", example = "芋道")
+    @Schema(description = "用户昵称，模拟匹配", example = "芋道")
     private String userNickname;
  
-    @Schema(description = "操作分类,参见 OperateLogTypeEnum 枚举类", example = "1")
+    @Schema(description = "操作分类，参见 OperateLogTypeEnum 枚举类", example = "1")
     private Integer type;
  
     @Schema(description = "操作状态", example = "true")
@@ -20,7 +20,7 @@ public class MailLogBaseVO {
     @Schema(description = "用户编号", example = "30883")
     private Long userId;
  
-    @Schema(description = "用户类型 - 参见 UserTypeEnum 枚举", example = "2")
+    @Schema(description = "用户类型，参见 UserTypeEnum 枚举", example = "2")
     private Byte userType;
  
     @Schema(description = "接收邮箱地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "76854@qq.com")
@@ -58,7 +58,7 @@ public class MailLogBaseVO {
     @NotNull(message = "邮件参数不能为空")
     private Map<String, Object> templateParams;
  
-    @Schema(description = "发送状态 - 参见 MailSendStatusEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "发送状态，参见 MailSendStatusEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "发送状态不能为空")
     private Byte sendStatus;
  
@@ -20,7 +20,7 @@ public class MailLogPageReqVO extends PageParam {
     @Schema(description = "用户编号", example = "30883")
     private Long userId;
  
-    @Schema(description = "用户类型 - 参见 UserTypeEnum 枚举", example = "2")
+    @Schema(description = "用户类型，参见 UserTypeEnum 枚举", example = "2")
     private Integer userType;
  
     @Schema(description = "接收邮箱地址 模糊匹配", example = "76854@qq.com")
@@ -32,7 +32,7 @@ public class MailLogPageReqVO extends PageParam {
     @Schema(description = "模板编号", example = "5678")
     private Long templateId;
  
-    @Schema(description = "发送状态 - 参见 MailSendStatusEnum 枚举", example = "1")
+    @Schema(description = "发送状态，参见 MailSendStatusEnum 枚举", example = "1")
     private Integer sendStatus;
  
     @Schema(description = "发送时间")
@@ -36,7 +36,7 @@ public class MailTemplateBaseVO {
     @NotEmpty(message = "内容不能为空")
     private String content;
  
-    @Schema(description = "状态 - 参见 CommonStatusEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "状态，参见 CommonStatusEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "状态不能为空")
     private Integer status;
  
@@ -17,13 +17,13 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @ToString(callSuper = true)
 public class MailTemplatePageReqVO extends PageParam {
  
-    @Schema(description = "状态 - 参见 CommonStatusEnum 枚举", example = "1")
+    @Schema(description = "状态，参见 CommonStatusEnum 枚举", example = "1")
     private Integer status;
  
-    @Schema(description = "标识 - 模糊匹配", example = "code_1024")
+    @Schema(description = "标识，模糊匹配", example = "code_1024")
     private String code;
  
-    @Schema(description = "名称 - 模糊匹配", example = "芋头")
+    @Schema(description = "名称，模糊匹配", example = "芋头")
     private String name;
  
     @Schema(description = "账号编号", example = "2048")
@@ -26,7 +26,7 @@ public class NoticeBaseVO {
     @Schema(description = "公告内容", requiredMode = Schema.RequiredMode.REQUIRED, example = "半生编码")
     private String content;
  
-    @Schema(description = "状态,参见 CommonStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "状态，参见 CommonStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Integer status;
  
 }
@@ -10,10 +10,10 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class NoticePageReqVO extends PageParam {
  
-    @Schema(description = "通知公告名称,模糊匹配", example = "芋道")
+    @Schema(description = "通知公告名称，模糊匹配", example = "芋道")
     private String title;
  
-    @Schema(description = "展示状态,参见 CommonStatusEnum 枚举类", example = "1")
+    @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1")
     private Integer status;
  
 }
@@ -21,7 +21,7 @@ public class NotifyMessageBaseVO {
     @NotNull(message = "用户编号不能为空")
     private Long userId;
  
-    @Schema(description = "用户类型 - 参见 UserTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "用户类型，参见 UserTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "用户类型不能为空")
     private Byte userType;
  
@@ -9,9 +9,9 @@ import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
  
 /**
-* 站内信模版 Base VO，提供给添加、修改、详细的子 VO 使用
-* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
-*/
+ * 站内信模版 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ */
 @Data
 public class NotifyTemplateBaseVO {
  
@@ -23,7 +23,7 @@ public class NotifyTemplateBaseVO {
     @NotNull(message = "模版编码不能为空")
     private String code;
  
-    @Schema(description = "模版类型 - 对应 system_notify_template_type 字典", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "模版类型，对应 system_notify_template_type 字典", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "模版类型不能为空")
     private Integer type;
  
@@ -35,7 +35,7 @@ public class NotifyTemplateBaseVO {
     @NotEmpty(message = "模版内容不能为空")
     private String content;
  
-    @Schema(description = "状态 - 参见 CommonStatusEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "状态，参见 CommonStatusEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "状态不能为空")
     @InEnum(value = CommonStatusEnum.class, message = "状态必须是 {value}")
     private Integer status;
 package cn.iocoder.yudao.module.system.controller.admin.notify.vo.template;
  
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
  
 import java.time.LocalDateTime;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import org.springframework.format.annotation.DateTimeFormat;
  
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
  
@@ -21,7 +23,7 @@ public class NotifyTemplatePageReqVO extends PageParam {
     @Schema(description = "模版名称", example = "我是名称")
     private String name;
  
-    @Schema(description = "状态 - 参见 CommonStatusEnum 枚举类", example = "1")
+    @Schema(description = "状态，参见 CommonStatusEnum 枚举类", example = "1")
     private Integer status;
  
     @Schema(description = "创建时间")
@@ -38,7 +38,7 @@ public class OAuth2ClientBaseVO {
     @Schema(description = "应用描述", example = "我是一个应用")
     private String description;
  
-    @Schema(description = "状态,参见 CommonStatusEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "状态，参见 CommonStatusEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "状态不能为空")
     private Integer status;
  
@@ -55,7 +55,7 @@ public class OAuth2ClientBaseVO {
     private List<@NotEmpty(message = "重定向的 URI 不能为空")
         @URL(message = "重定向的 URI 格式不正确") String> redirectUris;
  
-    @Schema(description = "授权类型,参见 OAuth2GrantTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "password")
+    @Schema(description = "授权类型，参见 OAuth2GrantTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "password")
     @NotNull(message = "授权类型不能为空")
     private List<String> authorizedGrantTypes;
  
@@ -10,10 +10,10 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
 @ToString(callSuper = true)
 public class OAuth2ClientPageReqVO extends PageParam {
  
-    @Schema(description = "应用名,模糊匹配", example = "土豆")
+    @Schema(description = "应用名，模糊匹配", example = "土豆")
     private String name;
  
-    @Schema(description = "状态,参见 CommonStatusEnum 枚举", example = "1")
+    @Schema(description = "状态，参见 CommonStatusEnum 枚举", example = "1")
     private Integer status;
  
 }
@@ -17,7 +17,7 @@ public class OAuth2OpenCheckTokenRespVO {
     @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "666")
     @JsonProperty("user_id")
     private Long userId;
-    @Schema(description = "用户类型,参见 UserTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Schema(description = "用户类型，参见 UserTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @JsonProperty("user_type")
     private Integer userType;
     @Schema(description = "租户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@@ -13,7 +13,7 @@ public class OAuth2AccessTokenPageReqVO extends PageParam {
     @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "666")
     private Long userId;
  
-    @Schema(description = "用户类型,参见 UserTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Schema(description = "用户类型，参见 UserTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     private Integer userType;
  
     @Schema(description = "客户端编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@@ -25,7 +25,7 @@ public class OAuth2AccessTokenRespVO {
     @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "666")
     private Long userId;
  
-    @Schema(description = "用户类型,参见 UserTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Schema(description = "用户类型，参见 UserTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     private Integer userType;
  
     @Schema(description = "客户端编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@@ -27,7 +27,7 @@ public class OAuth2UserInfoRespVO {
     @Schema(description = "手机号码", example = "15601691300")
     private String mobile;
  
-    @Schema(description = "用户性别,参见 SexEnum 枚举类", example = "1")
+    @Schema(description = "用户性别，参见 SexEnum 枚举类", example = "1")
     private Integer sex;
  
     @Schema(description = "用户头像", example = "https://www.iocoder.cn/xxx.png")
@@ -28,7 +28,7 @@ public class OAuth2UserUpdateReqVO {
     @Length(min = 11, max = 11, message = "手机号长度必须 11 位")
     private String mobile;
  
-    @Schema(description = "用户性别,参见 SexEnum 枚举类", example = "1")
+    @Schema(description = "用户性别，参见 SexEnum 枚举类", example = "1")
     private Integer sex;
  
 }
@@ -23,7 +23,7 @@ public class MenuBaseVO {
     @Size(max = 100)
     private String permission;
  
-    @Schema(description = "类型,参见 MenuTypeEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "类型，参见 MenuTypeEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "菜单类型不能为空")
     private Integer type;
  
@@ -7,10 +7,10 @@ import lombok.Data;
 @Data
 public class MenuListReqVO {
  
-    @Schema(description = "菜单名称,模糊匹配", example = "芋道")
+    @Schema(description = "菜单名称，模糊匹配", example = "芋道")
     private String name;
  
-    @Schema(description = "展示状态,参见 CommonStatusEnum 枚举类", example = "1")
+    @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1")
     private Integer status;
  
 }
@@ -18,7 +18,7 @@ public class MenuRespVO extends MenuBaseVO {
     @Schema(description = "菜单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long id;
  
-    @Schema(description = "状态,参见 CommonStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "状态，参见 CommonStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Integer status;
  
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式")
@@ -22,7 +22,7 @@ public class MenuSimpleRespVO {
     @Schema(description = "父菜单 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long parentId;
  
-    @Schema(description = "类型,参见 MenuTypeEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "类型，参见 MenuTypeEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Integer type;
  
 }
@@ -15,7 +15,7 @@ public class PermissionAssignRoleDataScopeReqVO {
     @NotNull(message = "角色编号不能为空")
     private Long roleId;
  
-    @Schema(description = "数据范围,参见 DataScopeEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "数据范围，参见 DataScopeEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "数据范围不能为空")
 //    TODO 这里要多一个枚举校验
     private Integer dataScope;
@@ -12,13 +12,13 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @Data
 public class RoleExportReqVO {
  
-    @Schema(description = "角色名称,模糊匹配", example = "芋道")
+    @Schema(description = "角色名称，模糊匹配", example = "芋道")
     private String name;
  
-    @Schema(description = "角色标识,模糊匹配", example = "yudao")
+    @Schema(description = "角色标识，模糊匹配", example = "yudao")
     private String code;
  
-    @Schema(description = "展示状态,参见 CommonStatusEnum 枚举类", example = "1")
+    @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1")
     private Integer status;
  
     @Schema(description = "开始时间", example = "[2022-07-01 00:00:00,2022-07-01 23:59:59]")
@@ -15,13 +15,13 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @EqualsAndHashCode(callSuper = true)
 public class RolePageReqVO extends PageParam {
  
-    @Schema(description = "角色名称,模糊匹配", example = "芋道")
+    @Schema(description = "角色名称，模糊匹配", example = "芋道")
     private String name;
  
-    @Schema(description = "角色标识,模糊匹配", example = "yudao")
+    @Schema(description = "角色标识，模糊匹配", example = "yudao")
     private String code;
  
-    @Schema(description = "展示状态,参见 CommonStatusEnum 枚举类", example = "1")
+    @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1")
     private Integer status;
  
     @Schema(description = "创建时间", example = "[2022-07-01 00:00:00,2022-07-01 23:59:59]")
@@ -19,16 +19,16 @@ public class RoleRespVO extends RoleBaseVO {
     @Schema(description = "角色编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Long id;
  
-    @Schema(description = "数据范围,参见 DataScopeEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "数据范围，参见 DataScopeEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Integer dataScope;
  
     @Schema(description = "数据范围(指定部门数组)", example = "1")
     private Set<Long> dataScopeDeptIds;
  
-    @Schema(description = "状态,参见 CommonStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "状态，参见 CommonStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Integer status;
  
-    @Schema(description = "角色类型,参见 RoleTypeEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "角色类型，参见 RoleTypeEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Integer type;
  
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式")
@@ -21,7 +21,7 @@ public class SensitiveWordBaseVO {
     @NotNull(message = "标签不能为空")
     private List<String> tags;
  
-    @Schema(description = "状态,参见 CommonStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "状态，参见 CommonStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "状态不能为空")
     private Integer status;
  
@@ -18,7 +18,7 @@ public class SensitiveWordExportReqVO {
     @Schema(description = "标签", example = "短信,评论")
     private String tag;
  
-    @Schema(description = "状态,参见 CommonStatusEnum 枚举类", example = "1")
+    @Schema(description = "状态，参见 CommonStatusEnum 枚举类", example = "1")
     private Integer status;
  
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@@ -23,7 +23,7 @@ public class SensitiveWordPageReqVO extends PageParam {
     @Schema(description = "标签", example = "短信,评论")
     private String tag;
  
-    @Schema(description = "状态,参见 CommonStatusEnum 枚举类", example = "1")
+    @Schema(description = "状态，参见 CommonStatusEnum 枚举类", example = "1")
     private Integer status;
  
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull;
 @ToString(callSuper = true)
 public class SmsChannelCreateReqVO extends SmsChannelBaseVO {
  
-    @Schema(description = "渠道编码,参见 SmsChannelEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "YUN_PIAN")
+    @Schema(description = "渠道编码，参见 SmsChannelEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "YUN_PIAN")
     @NotNull(message = "渠道编码不能为空")
     private String code;
  
@@ -20,7 +20,7 @@ public class SmsChannelPageReqVO extends PageParam {
     @Schema(description = "任务状态", example = "1")
     private Integer status;
  
-    @Schema(description = "短信签名,模糊匹配", example = "芋道源码")
+    @Schema(description = "短信签名，模糊匹配", example = "芋道源码")
     private String signature;
  
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@@ -16,7 +16,7 @@ public class SmsChannelRespVO extends SmsChannelBaseVO {
     @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long id;
  
-    @Schema(description = "渠道编码,参见 SmsChannelEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "YUN_PIAN")
+    @Schema(description = "渠道编码，参见 SmsChannelEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "YUN_PIAN")
     private String code;
  
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -17,7 +17,7 @@ public class SmsChannelSimpleRespVO {
     @NotNull(message = "短信签名不能为空")
     private String signature;
  
-    @Schema(description = "渠道编码,参见 SmsChannelEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "YUN_PIAN")
+    @Schema(description = "渠道编码，参见 SmsChannelEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "YUN_PIAN")
     private String code;
  
 }
@@ -26,14 +26,14 @@ public class SmsLogPageReqVO extends PageParam {
     @Schema(description = "手机号", example = "15601691300")
     private String mobile;
  
-    @Schema(description = "发送状态,参见 SmsSendStatusEnum 枚举类", example = "1")
+    @Schema(description = "发送状态，参见 SmsSendStatusEnum 枚举类", example = "1")
     private Integer sendStatus;
  
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @Schema(description = "发送时间")
     private LocalDateTime[] sendTime;
  
-    @Schema(description = "接收状态,参见 SmsReceiveStatusEnum 枚举类", example = "0")
+    @Schema(description = "接收状态，参见 SmsReceiveStatusEnum 枚举类", example = "0")
     private Integer receiveStatus;
  
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@@ -11,11 +11,11 @@ import javax.validation.constraints.NotNull;
 @Data
 public class SmsTemplateBaseVO {
  
-    @Schema(description = "短信类型,参见 SmsTemplateTypeEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "短信类型，参见 SmsTemplateTypeEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "短信类型不能为空")
     private Integer type;
  
-    @Schema(description = "开启状态,参见 CommonStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "开启状态，参见 CommonStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "开启状态不能为空")
     private Integer status;
  
@@ -18,13 +18,13 @@ public class SmsTemplateExportReqVO {
     @Schema(description = "开启状态", example = "1")
     private Integer status;
  
-    @Schema(description = "模板编码,模糊匹配", example = "test_01")
+    @Schema(description = "模板编码，模糊匹配", example = "test_01")
     private String code;
  
-    @Schema(description = "模板内容,模糊匹配", example = "你好，{name}。你长的太{like}啦！")
+    @Schema(description = "模板内容，模糊匹配", example = "你好，{name}。你长的太{like}啦！")
     private String content;
  
-    @Schema(description = "短信 API 的模板编号,模糊匹配", example = "4383920")
+    @Schema(description = "短信 API 的模板编号，模糊匹配", example = "4383920")
     private String apiTemplateId;
  
     @Schema(description = "短信渠道编号", example = "10")
@@ -23,13 +23,13 @@ public class SmsTemplatePageReqVO extends PageParam {
     @Schema(description = "开启状态", example = "1")
     private Integer status;
  
-    @Schema(description = "模板编码,模糊匹配", example = "test_01")
+    @Schema(description = "模板编码，模糊匹配", example = "test_01")
     private String code;
  
-    @Schema(description = "模板内容,模糊匹配", example = "你好，{name}。你长的太{like}啦！")
+    @Schema(description = "模板内容，模糊匹配", example = "你好，{name}。你长的太{like}啦！")
     private String content;
  
-    @Schema(description = "短信 API 的模板编号,模糊匹配", example = "4383920")
+    @Schema(description = "短信 API 的模板编号，模糊匹配", example = "4383920")
     private String apiTemplateId;
  
     @Schema(description = "短信渠道编号", example = "10")
@@ -18,7 +18,7 @@ import javax.validation.constraints.NotNull;
 @Builder
 public class SocialUserBindReqVO {
  
-    @Schema(description = "社交平台的类型,参见 UserSocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
+    @Schema(description = "社交平台的类型，参见 UserSocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
     @InEnum(SocialTypeEnum.class)
     @NotNull(message = "社交平台的类型不能为空")
     private Integer type;
@@ -18,7 +18,7 @@ import javax.validation.constraints.NotNull;
 @Builder
 public class SocialUserUnbindReqVO {
  
-    @Schema(description = "社交平台的类型,参见 UserSocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
+    @Schema(description = "社交平台的类型，参见 UserSocialTypeEnum 枚举值", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
     @InEnum(SocialTypeEnum.class)
     @NotNull(message = "社交平台的类型不能为空")
     private Integer type;
@@ -7,9 +7,9 @@ import javax.validation.constraints.NotNull;
 import java.util.Set;
  
 /**
-* 租户套餐 Base VO，提供给添加、修改、详细的子 VO 使用
-* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
-*/
+ * 租户套餐 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ */
 @Data
 public class TenantPackageBaseVO {
  
@@ -17,7 +17,7 @@ public class TenantPackageBaseVO {
     @NotNull(message = "套餐名不能为空")
     private String name;
  
-    @Schema(description = "状态,参见 CommonStatusEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "状态，参见 CommonStatusEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "状态不能为空")
     private Integer status;
  
@@ -8,7 +8,7 @@ import java.time.LocalDateTime;
  
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
  
-@Schema(description = "管理后台 - 租户 Excel 导出 Request VO,参数和 TenantPageReqVO 是一致的")
+@Schema(description = "管理后台 - 租户 Excel 导出 Request VO，参数和 TenantPageReqVO 是一致的")
 @Data
 public class TenantExportReqVO {
  
@@ -24,8 +24,8 @@ public class TenantExportReqVO {
     @Schema(description = "租户状态（0正常 1停用）", example = "1")
     private Integer status;
  
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
  
 }
@@ -21,7 +21,7 @@ public class UserProfileRespVO extends UserBaseVO {
     @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Long id;
  
-    @Schema(description = "状态,参见 CommonStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "状态，参见 CommonStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Integer status;
  
     @Schema(description = "最后登录 IP", requiredMode = Schema.RequiredMode.REQUIRED, example = "192.168.1.1")
@@ -92,7 +92,7 @@ public class UserProfileRespVO extends UserBaseVO {
     @Data
     public static class SocialUser {
  
-        @Schema(description = "社交平台的类型,参见 SocialTypeEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
+        @Schema(description = "社交平台的类型，参见 SocialTypeEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
         private Integer type;
  
         @Schema(description = "社交用户的 openid", requiredMode = Schema.RequiredMode.REQUIRED, example = "IPRmJ0wvBptiPIlGEZiPewGwiEiE")
@@ -45,7 +45,7 @@ public class UserBaseVO {
     @Mobile
     private String mobile;
  
-    @Schema(description = "用户性别,参见 SexEnum 枚举类", example = "1")
+    @Schema(description = "用户性别，参见 SexEnum 枚举类", example = "1")
     private Integer sex;
  
     @Schema(description = "用户头像", example = "https://www.iocoder.cn/xxx.png")
@@ -16,13 +16,13 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @AllArgsConstructor
 public class UserExportReqVO {
  
-    @Schema(description = "用户账号,模糊匹配", example = "yudao")
+    @Schema(description = "用户账号，模糊匹配", example = "yudao")
     private String username;
  
-    @Schema(description = "手机号码,模糊匹配", example = "yudao")
+    @Schema(description = "手机号码，模糊匹配", example = "yudao")
     private String mobile;
  
-    @Schema(description = "展示状态,参见 CommonStatusEnum 枚举类", example = "1")
+    @Schema(description = "展示状态，参见 CommonStatusEnum 枚举类", example = "1")
     private Integer status;
  
     @Schema(description = "创建时间", example = "[2022-07-01 00:00:00,2022-07-01 23:59:59]")
@@ -16,7 +16,7 @@ public class UserRespVO extends UserBaseVO {
     @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Long id;
  
-    @Schema(description = "状态,参见 CommonStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "状态，参见 CommonStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Integer status;
  
     @Schema(description = "最后登录 IP", requiredMode = Schema.RequiredMode.REQUIRED, example = "192.168.1.1")
 package cn.iocoder.yudao.module.system.convert.auth;
  
-import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeSendReqDTO;
 import cn.iocoder.yudao.module.system.api.sms.dto.code.SmsCodeUseReqDTO;
 import cn.iocoder.yudao.module.system.api.social.dto.SocialUserBindReqDTO;
@@ -15,6 +14,7 @@ import org.slf4j.LoggerFactory;
  
 import java.util.*;
  
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.filterList;
 import static cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO.ID_ROOT;
  
@@ -28,8 +28,8 @@ public interface AuthConvert {
     default AuthPermissionInfoRespVO convert(AdminUserDO user, List<RoleDO> roleList, List<MenuDO> menuList) {
         return AuthPermissionInfoRespVO.builder()
             .user(AuthPermissionInfoRespVO.UserVO.builder().id(user.getId()).nickname(user.getNickname()).avatar(user.getAvatar()).build())
-            .roles(CollectionUtils.convertSet(roleList, RoleDO::getCode))
-            .permissions(CollectionUtils.convertSet(menuList, MenuDO::getPermission))
+            .roles(convertSet(roleList, RoleDO::getCode))
+            .permissions(convertSet(menuList, MenuDO::getPermission))
             .build();
     }