From 82d09815c5efb03d448d6a5b74a5cbfe85063ebc Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 30 八月 2023 18:46:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineEventVO.java | 184 +--------------------------------------------
1 files changed, 7 insertions(+), 177 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 6770a11..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,192 +1,22 @@
package com.vci.ubcs.omd.vo;
+import com.vci.ubcs.omd.entity.LifeCycleLineEvent;
+import lombok.Data;
+
import java.util.Date;
/**
* 鐢熷懡鍛ㄦ湡杩炴帴绾夸簨浠�
- * @author weidy
- * @date 2019/10/11 4:54 PM
+ * @author LiHang
+ * @date 2023/4/3
*/
-public class LifeCycleLineEventVO implements java.io.Serializable{
+@Data
+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;
-
- public String getOid() {
- return oid;
- }
-
- public void setOid(String oid) {
- this.oid = oid;
- }
-
- public String getPkLifeCycleLine() {
- return pkLifeCycleLine;
- }
-
- public void setPkLifeCycleLine(String pkLifeCycleLine) {
- this.pkLifeCycleLine = pkLifeCycleLine;
- }
-
- 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 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 Integer getOrderNum() {
- return orderNum;
- }
-
- public void setOrderNum(Integer orderNum) {
- this.orderNum = orderNum;
- }
-
-
- 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 "OsLifeCycleLineEventVO{" +
- "oid='" + oid + '\'' +
- ", pkLifeCycleLine='" + pkLifeCycleLine + '\'' +
- ", eventFullName='" + eventFullName + '\'' +
- ", eventShowName='" + eventShowName + '\'' +
- ", orderNum=" + orderNum +
- ", btmname='" + btmname + '\'' +
- ", owner='" + owner + '\'' +
- ", creator='" + creator + '\'' +
- ", createTime=" + createTime +
- ", lastModifier='" + lastModifier + '\'' +
- ", lastModifyTime=" + lastModifyTime +
- ", ts=" + ts +
- '}';
- }
}
--
Gitblit v1.9.3