From bd82db69b89b638d4eeb9dafb9c1318cb5323354 Mon Sep 17 00:00:00 2001
From: AprilWind <2100166581@qq.com>
Date: Fri, 20 Dec 2024 15:43:58 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=9B=B4=E6=96=B0=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workflow/domain/bo/FlowInstanceBo.java        |  4 ++--
 .../workflow/domain/vo/FlowDefinitionVo.java      |  6 +++---
 .../dromara/workflow/domain/vo/FlowHisTaskVo.java |  2 +-
 .../workflow/domain/vo/FlowInstanceVo.java        | 15 ++++++++-------
 .../dromara/workflow/domain/vo/FlowTaskVo.java    |  2 +-
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInstanceBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInstanceBo.java
index 9d11c93fb..fb1fe611b 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInstanceBo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInstanceBo.java
@@ -18,12 +18,12 @@ public class FlowInstanceBo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 流程名称
+     * 流程定义名称
      */
     private String flowName;
 
     /**
-     * 流程编码
+     * 流程定义编码
      */
     private String flowCode;
 
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java
index 7f55b567c..aef75739a 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java
@@ -42,12 +42,12 @@ public class FlowDefinitionVo implements Serializable {
     private String delFlag;
 
     /**
-     * 流程编码
+     * 流程定义编码
      */
     private String flowCode;
 
     /**
-     * 流程名称
+     * 流程定义名称
      */
     private String flowName;
 
@@ -68,7 +68,7 @@ public class FlowDefinitionVo implements Serializable {
     private String version;
 
     /**
-     * 是否发布（0未开启 1开启）
+     * 是否发布（0未发布 1已发布 9失效）
      */
     private Integer isPublish;
 
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java
index 70540f103..8776a76b8 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java
@@ -51,7 +51,7 @@ public class FlowHisTaskVo implements Serializable {
     private Long definitionId;
 
     /**
-     * 流程名称
+     * 流程定义名称
      */
     private String flowName;
 
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java
index ec091d05a..75543f419 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java
@@ -43,12 +43,12 @@ public class FlowInstanceVo {
     private Long definitionId;
 
     /**
-     * 流程名称
+     * 流程定义名称
      */
     private String flowName;
 
     /**
-     * 流程名称
+     * 流程定义编码
      */
     private String flowCode;
 
@@ -92,11 +92,6 @@ public class FlowInstanceVo {
      */
     private Integer activityStatus;
 
-    /**
-     * 创建者
-     */
-    private String createBy;
-
     /**
      * 审批表单是否自定义（Y是 N否）
      */
@@ -116,6 +111,12 @@ public class FlowInstanceVo {
      * 流程定义版本
      */
     private String version;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
     /**
      * 申请人
      */
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java
index 3be1ef1e4..3fb08d954 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java
@@ -56,7 +56,7 @@ public class FlowTaskVo implements Serializable {
     private Long instanceId;
 
     /**
-     * 流程名称
+     * 流程定义名称
      */
     private String flowName;