From 7575eaa766eb186a0eb3717ddfd10d8831847207 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 12 十月 2023 09:48:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleDTO.java | 55 ++++++++++---------------------------------------------
1 files changed, 10 insertions(+), 45 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleDTO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleDTO.java
index 7a1ccf6..406c378 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleDTO.java
@@ -1,5 +1,6 @@
package com.vci.ubcs.omd.dto;
+import com.vci.ubcs.omd.entity.LifeCycleRule;
import lombok.Data;
import java.util.Date;
@@ -11,56 +12,20 @@
* @date 2019/10/14 17:28
*/
@Data
-public class LifeCycleDTO implements java.io.Serializable {
+public class LifeCycleDTO extends LifeCycleRule {
/**
* 绂佹淇敼杩欎釜鍊�
*/
private static final long serialVersionUID = -2896532706167604421L;
- /**
- * 涓婚敭
- */
- private String oid;
+ /**
+ * 鑺傜偣
+ */
+ private List<LifeCycleNodeDTO> nodes;
- /**
- * 鐢熷懡鍛ㄦ湡缂栧彿
- */
- private String id;
-
- /**
- * 鐢熷懡鍛ㄦ湡鍚嶇О
- */
- private String name;
-
- /**
- * 鎻忚堪
- */
- private String description;
-
- /**
- * 璧峰鐘舵��
- */
- private String startStatus;
-
- /**
- * 璧峰鐘舵�佸悕绉�
- */
- private String startStatusName;
-
- /**
- * 鍦ㄦ壂鎻忕殑鏃跺�欒褰曡繖涓敓鍛藉懆鏈熷搴旂殑绫诲叏璺緞
- */
- private String classFullName;
-
- /**
- * 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
- */
- private Date ts;
-
- /**
- * 鍖呭惈鐨勮繛鎺ョ嚎
- */
- private List<LifeCycleLineDTO> lineDTOList;
-
+ /**
+ * 杈圭晫鍜岃繛鎺ョ嚎
+ */
+ private List<LifeCycleEdgeDTO> edges;
}
--
Gitblit v1.9.3