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/vo/LifeCycleLineEventVO.java |   62 +------------------------------
 1 files changed, 2 insertions(+), 60 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineEventVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineEventVO.java
index 9db39af..25822d2 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineEventVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineEventVO.java
@@ -1,6 +1,7 @@
 package com.vci.ubcs.omd.vo;
 
 
+import com.vci.ubcs.omd.entity.LifeCycleLineEvent;
 import lombok.Data;
 
 import java.util.Date;
@@ -11,70 +12,11 @@
  * @date 2023/4/3
  */
 @Data
-public class LifeCycleLineEventVO implements java.io.Serializable{
+public class LifeCycleLineEventVO extends LifeCycleLineEvent {
 
     /**
      * 绂佹淇敼杩欎釜鍊�
      */
     private static final long serialVersionUID = 216430078444875215L;
 
-    /**
-     * 涓婚敭
-     */
-    private String oid;
-
-    /**
-     * 鎵�灞炵敓鍛藉懆鏈熻繛鎺ョ嚎涓婚敭
-     */
-    private String pkLifeCycleLine;
-
-    /**
-     * 浜嬩欢鐨勫叏璺緞
-     */
-    private String eventFullName;
-
-    /**
-     * 浜嬩欢鐨勫悕绉�
-     */
-    private String eventShowName;
-
-    /**
-     * 鎺掑簭鍙�
-     */
-    private Integer orderNum;
-
-    /**
-     * 涓氬姟绫诲瀷鍚嶇О
-     */
-    private String btmname;
-
-    /**
-     * 鎷ユ湁鑰�
-     */
-    private String owner;
-
-    /**
-     * 鍒涘缓浜�
-     */
-    private String creator;
-
-    /**
-     * 鍒涘缓鏃堕棿
-     */
-    private Date createTime;
-
-    /**
-     * 鏈�鍚庝慨鏀逛汉
-     */
-    private String lastModifier;
-
-    /**
-     * 鏈�鍚庝慨鏀规椂闂达紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss
-     */
-    private Date lastModifyTime;
-
-    /**
-     * 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
-     */
-    private Date ts;
 }

--
Gitblit v1.9.3