合并最新 master 代码

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageReqVO.java

 package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
 
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import cn.iocoder.yudao.framework.common.util.date.DateUtils;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -12,17 +12,17 @@ import java.time.LocalDateTime;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
-@ApiModel("管理后台 - 流程任务的 TODO 待办的分页 Request VO")
+@Schema(description = "管理后台 - 流程任务的 TODO 待办的分页 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class BpmTaskTodoPageReqVO extends PageParam {
 
-    @ApiModelProperty(value = "流程任务名", example = "芋道")
+    @Schema(description = "流程任务名", example = "芋道")
     private String name;
 
-    @ApiModelProperty(value = "创建收间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthMenuRespVO.java

 package cn.iocoder.yudao.module.system.controller.admin.auth.vo;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -9,41 +8,41 @@ import lombok.NoArgsConstructor;
 
 import java.util.List;
 
-@ApiModel("管理后台 - 登录用户的菜单信息 Response VO")
+@Schema(description = "管理后台 - 登录用户的菜单信息 Response VO")
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
 public class AuthMenuRespVO {
 
-    @ApiModelProperty(value = "菜单名称", required = true, example = "芋道")
+    @Schema(description = "菜单名称", required = true, example = "芋道")
     private Long id;
 
-    @ApiModelProperty(value = "父菜单 ID", required = true, example = "1024")
+    @Schema(description = "父菜单 ID", required = true, example = "1024")
     private Long parentId;
 
-    @ApiModelProperty(value = "菜单名称", required = true, example = "芋道")
+    @Schema(description = "菜单名称", required = true, example = "芋道")
     private String name;
 
-    @ApiModelProperty(value = "路由地址", example = "post", notes = "仅菜单类型为菜单或者目录时，才需要传")
+    @Schema(description = "路由地址,仅菜单类型为菜单或者目录时，才需要传", example = "post")
     private String path;
 
-    @ApiModelProperty(value = "组件路径", example = "system/post/index", notes = "仅菜单类型为菜单时，才需要传")
+    @Schema(description = "组件路径,仅菜单类型为菜单时，才需要传", example = "system/post/index")
     private String component;
 
-    @ApiModelProperty(value = "组件名", example = "SystemUser")
+    @Schema(description = "组件名", example = "SystemUser")
     private String componentName;
 
-    @ApiModelProperty(value = "菜单图标", example = "/menu/list", notes = "仅菜单类型为菜单或者目录时，才需要传")
+    @Schema(description = "菜单图标,仅菜单类型为菜单或者目录时，才需要传", example = "/menu/list")
     private String icon;
 
-    @ApiModelProperty(value = "是否可见", required = true, example = "false")
+    @Schema(description = "是否可见", required = true, example = "false")
     private Boolean visible;
 
-    @ApiModelProperty(value = "是否缓存", required = true, example = "false")
+    @Schema(description = "是否缓存", required = true, example = "false")
     private Boolean keepAlive;
 
-    @ApiModelProperty(value = "是否总是显示", example = "false")
+    @Schema(description = "是否总是显示", example = "false")
     private Boolean alwaysShow;
 
     /**

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuBaseVO.java

 package cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu;
 
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -14,52 +14,52 @@ import javax.validation.constraints.Size;
 @Data
 public class MenuBaseVO {
 
-    @ApiModelProperty(value = "菜单名称", required = true, example = "芋道")
+    @Schema(description = "菜单名称", required = true, example = "芋道")
     @NotBlank(message = "菜单名称不能为空")
     @Size(max = 50, message = "菜单名称长度不能超过50个字符")
     private String name;
 
-    @ApiModelProperty(value = "权限标识", example = "sys:menu:add", notes = "仅菜单类型为按钮时，才需要传递")
+    @Schema(description = "权限标识,仅菜单类型为按钮时，才需要传递", example = "sys:menu:add")
     @Size(max = 100)
     private String permission;
 
-    @ApiModelProperty(value = "类型", required = true, example = "1", notes = "参见 MenuTypeEnum 枚举类")
+    @Schema(description = "类型,参见 MenuTypeEnum 枚举类", required = true, example = "1")
     @NotNull(message = "菜单类型不能为空")
     private Integer type;
 
-    @ApiModelProperty(value = "显示顺序不能为空", required = true, example = "1024")
+    @Schema(description = "显示顺序不能为空", required = true, example = "1024")
     @NotNull(message = "显示顺序不能为空")
     private Integer sort;
 
-    @ApiModelProperty(value = "父菜单 ID", required = true, example = "1024")
+    @Schema(description = "父菜单 ID", required = true, example = "1024")
     @NotNull(message = "父菜单 ID 不能为空")
     private Long parentId;
 
-    @ApiModelProperty(value = "路由地址", example = "post", notes = "仅菜单类型为菜单或者目录时，才需要传")
+    @Schema(description = "路由地址,仅菜单类型为菜单或者目录时，才需要传", example = "post")
     @Size(max = 200, message = "路由地址不能超过200个字符")
     private String path;
 
-    @ApiModelProperty(value = "菜单图标", example = "/menu/list", notes = "仅菜单类型为菜单或者目录时，才需要传")
+    @Schema(description = "菜单图标,仅菜单类型为菜单或者目录时，才需要传", example = "/menu/list")
     private String icon;
 
-    @ApiModelProperty(value = "组件路径", example = "system/post/index", notes = "仅菜单类型为菜单时，才需要传")
+    @Schema(description = "组件路径,仅菜单类型为菜单时，才需要传", example = "system/post/index")
     @Size(max = 200, message = "组件路径不能超过255个字符")
     private String component;
 
-    @ApiModelProperty(value = "组件名", example = "SystemUser")
+    @Schema(description = "组件名", example = "SystemUser")
     private String componentName;
 
-    @ApiModelProperty(value = "状态", required = true, example = "1", notes = "见 CommonStatusEnum 枚举")
+    @Schema(description = "状态,见 CommonStatusEnum 枚举", required = true, example = "1")
     @NotNull(message = "状态不能为空")
     private Integer status;
 
-    @ApiModelProperty(value = "是否可见", example = "false")
+    @Schema(description = "是否可见", example = "false")
     private Boolean visible;
 
-    @ApiModelProperty(value = "是否缓存", example = "false")
+    @Schema(description = "是否缓存", example = "false")
     private Boolean keepAlive;
 
-    @ApiModelProperty(value = "是否总是显示", example = "false")
+    @Schema(description = "是否总是显示", example = "false")
     private Boolean alwaysShow;
 
 }