From 42a7552b9c8603aeab7f0785eb05270dfbeb0bd3 Mon Sep 17 00:00:00 2001 From: zxl <763096477@qq.com> Date: 星期日, 02 三月 2025 10:16:20 +0800 Subject: [PATCH] Merge branch 'master' into dev --- business/src/main/java/com/ycl/domain/vo/ProjectProcessVO.java | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) diff --git a/business/src/main/java/com/ycl/domain/vo/ProjectProcessVO.java b/business/src/main/java/com/ycl/domain/vo/ProjectProcessVO.java index 5e880bc..356b9c3 100644 --- a/business/src/main/java/com/ycl/domain/vo/ProjectProcessVO.java +++ b/business/src/main/java/com/ycl/domain/vo/ProjectProcessVO.java @@ -9,7 +9,9 @@ import org.springframework.lang.NonNull; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.Date; +import java.util.List; /** * 娴佺▼鎺ㄨ繘鍒楄〃淇℃伅琛ㄥ睍绀� @@ -21,10 +23,28 @@ @ApiModel(value = "椤圭洰绠$悊鍩虹淇℃伅琛ㄥ搷搴旀暟鎹�", description = "椤圭洰绠$悊鍩虹淇℃伅琛ㄥ搷搴旀暟鎹�") public class ProjectProcessVO extends ProjectInfoVO { - /** 娴佺▼id */ - @ApiModelProperty("娴佺▼id") - private Integer flowableProcessId; + /** 娴佺▼瀹氫箟id */ + @ApiModelProperty("娴佺▼瀹氫箟id") + private String processDefId; + + @ApiModelProperty("鍙戝竷id") + private String deployId; @ApiModelProperty("娴佺▼鍚嶇О") private String flowableProcessName; + + @ApiModelProperty("娴佺▼瀹炰緥id") + private String processInsId; + + @ApiModelProperty("娴佺▼鏄惁鎸傝捣/鏆傚仠") + private boolean suspended; + + @ApiModelProperty("鎶曡祫棰�") + private String investmentAmount; + + @ApiModelProperty("寮�宸ョ姸鎬�") + private String status; + + @ApiModelProperty("宸ョ▼鍒楄〃") + private List<ProjectEngineeringVO> children = new ArrayList<>(); } -- Gitblit v1.8.0