From 773d9314b7f1bf4dce390bf8fa0b6a9b12e32344 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期日, 25 六月 2023 14:25:43 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleLineEventDTO.java |   26 ++------------------------
 1 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleLineEventDTO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleLineEventDTO.java
index 2f01763..ba07d73 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleLineEventDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleLineEventDTO.java
@@ -1,5 +1,6 @@
 package com.vci.ubcs.omd.dto;
 
+import com.vci.ubcs.omd.entity.LifeCycleLineEvent;
 import lombok.Data;
 
 import java.util.Date;
@@ -10,35 +11,12 @@
  * @date 2019/10/14 17:47
  */
 @Data
-public class LifeCycleLineEventDTO implements java.io.Serializable {
+public class LifeCycleLineEventDTO extends LifeCycleLineEvent {
 
 	/**
 	 * 绂佹淇敼杩欎釜鍊�
 	 */
 	private static final long serialVersionUID = 6860210157516359420L;
-	/**
-	 * 涓婚敭
-	 */
-	private String oid;
 
-	/**
-	 * 鎵�灞炵敓鍛藉懆鏈熻繛鎺ョ嚎涓婚敭
-	 */
-	private String pkLifeCycleLine;
-
-	/**
-	 * 浜嬩欢鐨勫叏璺緞
-	 */
-	private String eventFullName;
-
-	/**
-	 * 浜嬩欢鐨勫悕绉�
-	 */
-	private String eventShowName;
-
-	/**
-	 * 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
-	 */
-	private Date ts;
 
 }

--
Gitblit v1.9.3