From ed8fc5f674544d3af63c6f68093ffc038385c493 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期一, 16 十二月 2024 09:30:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceRespVO.java | 23 ++++-------------------
1 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceRespVO.java b/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceRespVO.java
index 4885ed6..5647f31 100644
--- a/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceRespVO.java
+++ b/iailab-module-bpm/iailab-module-bpm-biz/src/main/java/com/iailab/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceRespVO.java
@@ -1,5 +1,6 @@
package com.iailab.module.bpm.controller.admin.task.vo.instance;
+import com.iailab.module.bpm.controller.admin.base.user.UserSimpleBaseVO;
import com.iailab.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -15,7 +16,7 @@
@Schema(description = "流程实例的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private String id;
- @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "平台")
+ @Schema(description = "流程名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
private String name;
@Schema(description = "流程分类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@@ -44,7 +45,7 @@
/**
* 发起流程的用户
*/
- private User startUser;
+ private UserSimpleBaseVO startUser;
@Schema(description = "流程定义的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
private String processDefinitionId;
@@ -58,22 +59,6 @@
*/
private List<Task> tasks; // 仅在流程实例分页才返回
- @Schema(description = "用户信息")
- @Data
- public static class User {
-
- @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Long id;
- @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "iailab")
- private String nickname;
-
- @Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- private Long deptId;
- @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "研发部")
- private String deptName;
-
- }
-
@Schema(description = "流程任务")
@Data
public static class Task {
@@ -81,7 +66,7 @@
@Schema(description = "流程任务的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private String id;
- @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "平台")
+ @Schema(description = "任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
private String name;
}
--
Gitblit v1.9.3