From 36d3d9da36c71e65081e38cf9cfbd5e0ff6bfeed Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 14 七月 2023 21:15:42 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-ops-api/ubcs-flow-api/src/main/java/com/vci/ubcs/flow/core/vo/FlowTaskVO.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/entity/FlowTaskDTO.java b/Source/UBCS/ubcs-ops-api/ubcs-flow-api/src/main/java/com/vci/ubcs/flow/core/vo/FlowTaskVO.java
similarity index 87%
copy from Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/entity/FlowTaskDTO.java
copy to Source/UBCS/ubcs-ops-api/ubcs-flow-api/src/main/java/com/vci/ubcs/flow/core/vo/FlowTaskVO.java
index 98200f6..d74ef53 100644
--- a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/entity/FlowTaskDTO.java
+++ b/Source/UBCS/ubcs-ops-api/ubcs-flow-api/src/main/java/com/vci/ubcs/flow/core/vo/FlowTaskVO.java
@@ -14,8 +14,10 @@
* this software without specific prior written permission.
* Author: Chill 搴勯獮 (smallchill@163.com)
*/
-package com.vci.ubcs.flow.engine.entity;
+package com.vci.ubcs.flow.core.vo;
+import com.vci.ubcs.flow.core.entity.FlowTaskUser;
+import com.vci.ubcs.flow.core.entity.ProcessStageAttr;
import lombok.Data;
import java.io.Serializable;
@@ -28,7 +30,7 @@
* @author wang1
*/
@Data
-public class FlowTaskDTO implements Serializable {
+public class FlowTaskVO extends FlowTaskUser{
private static final long serialVersionUID = 1L;
@@ -57,11 +59,11 @@
private String conditionValue;//鍚屾剰銆侀┏鍥炲埌鐨勪笅涓�涓妭鐐圭殑鏉′欢value
//娴佺▼涓弬鏁�
- private List<FlowTaskDTO> toTasks;//娴佺▼涓嬩竴姝ユ寜閽�
+ private List<FlowTaskVO> toTasks;//娴佺▼涓嬩竴姝ユ寜閽�
private Map<String, Object> variables;//娴佺▼鍙傛暟
//娴佺▼闃舵缁戝畾鐨勫睘鎬�
- private List<ProcessStageAttr> stageAttrs;
+ private List<ProcessStageAttrVO> stageAttrs;
--
Gitblit v1.9.3