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/LifeCycleEventVO.java |  170 ++------------------------------------------------------
 1 files changed, 7 insertions(+), 163 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleEventVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleEventVO.java
index f3600ee..3588cf6 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleEventVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleEventVO.java
@@ -1,177 +1,21 @@
 package com.vci.ubcs.omd.vo;
 
+import com.vci.ubcs.omd.entity.LifeCycleEvent;
+import lombok.Data;
+
 import java.util.Date;
 
 /**
  * 鐢熷懡鍛ㄦ湡浜嬩欢鏄剧ず瀵硅薄
- * @author weidy
- * @date 2019/10/17 9:46
+ * @author LiHang
+ * @date 2023/4/3
  */
-public class LifeCycleEventVO implements java.io.Serializable{
+@Data
+public class LifeCycleEventVO extends LifeCycleEvent {
 
     /**
      * 绂佹淇敼杩欎釜鍊�
      */
     private static final long serialVersionUID = 8503381504954264216L;
 
-    /**
-     * 涓婚敭
-     */
-    private String oid;
-
-    /**
-     * 浜嬩欢鐨勫叏璺緞
-     */
-    private String eventFullName;
-
-    /**
-     * 浜嬩欢鐨勫悕绉�
-     */
-    private String eventShowName;
-
-    /**
-     * 浜嬩欢鎻忚堪
-     */
-    private String description;
-
-    /**
-     * 涓氬姟绫诲瀷鍚嶇О
-     */
-    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;
-
-    public String getEventFullName() {
-        return eventFullName;
-    }
-
-    public void setEventFullName(String eventFullName) {
-        this.eventFullName = eventFullName;
-    }
-
-    public String getEventShowName() {
-        return eventShowName;
-    }
-
-    public void setEventShowName(String eventShowName) {
-        this.eventShowName = eventShowName;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getLastModifier() {
-        return lastModifier;
-    }
-
-    public void setLastModifier(String lastModifier) {
-        this.lastModifier = lastModifier;
-    }
-
-    public Date getLastModifyTime() {
-        return lastModifyTime;
-    }
-
-    public void setLastModifyTime(Date lastModifyTime) {
-        this.lastModifyTime = lastModifyTime;
-    }
-
-    public Date getTs() {
-        return ts;
-    }
-
-    public void setTs(Date ts) {
-        this.ts = ts;
-    }
-
-    public String getOid() {
-        return oid;
-    }
-
-    public void setOid(String oid) {
-        this.oid = oid;
-    }
-
-
-    public String getBtmname() {
-        return btmname;
-    }
-
-    public void setBtmname(String btmname) {
-        this.btmname = btmname;
-    }
-
-    public String getOwner() {
-        return owner;
-    }
-
-    public void setOwner(String owner) {
-        this.owner = owner;
-    }
-
-    @Override
-    public String toString() {
-        return "OsLifeCycleEventVO{" +
-                "oid='" + oid + '\'' +
-                ", eventFullName='" + eventFullName + '\'' +
-                ", eventShowName='" + eventShowName + '\'' +
-                ", description='" + description + '\'' +
-                ", btmname='" + btmname + '\'' +
-                ", owner='" + owner + '\'' +
-                ", creator='" + creator + '\'' +
-                ", createTime=" + createTime +
-                ", lastModifier='" + lastModifier + '\'' +
-                ", lastModifyTime=" + lastModifyTime +
-                ", ts=" + ts +
-                '}';
-    }
 }

--
Gitblit v1.9.3