From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/ProcessDetailVO.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProcessDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProcessDetailVO.java
new file mode 100644
index 0000000..02f4eed
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProcessDetailVO.java
@@ -0,0 +1,21 @@
+package com.ruoyi.system.vo;
+
+import com.aizuda.bpm.engine.entity.FlwHisTask;
+import com.ruoyi.system.model.StateProcessInstanceAction;
+import com.ruoyi.system.model.TContract;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+@Data
+@ApiModel(value = "审批流详情返回VO")
+public class ProcessDetailVO extends TContract {
+
+ @ApiModelProperty(value = "操作记录集合")
+ private List<StateProcessInstanceAction> instanceActions;
+
+ @ApiModelProperty(value = "历史任务")
+ private List<FlwHisTask> flwHisTasks;
+
+}
--
Gitblit v1.7.1