From ee7d7c29b8d95f0adab3bd9d93fdb1af51565a2d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 03 八月 2023 20:54:48 +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/entity/LifeCycleLineEvent.java |   75 +++++++++++++++++++------------------
 1 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLineEvent.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLineEvent.java
index 2f8d1cf..30a4935 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLineEvent.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLineEvent.java
@@ -3,6 +3,8 @@
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vci.ubcs.starter.revision.model.BaseModel;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
@@ -15,24 +17,19 @@
  * @date 2019/10/11 2:49 PM
  */
 @Data
-@TableName("pl_omd_life_cycle_line_event")
+@TableName("pl_omd_line_event")
 @ApiModel(value = "鐢熷懡鍛ㄦ湡鐘舵�佽繛鎺ョ嚎", description = "鐢熷懡鍛ㄦ湡鐘舵�佽繛鎺ョ嚎")
-public class LifeCycleLineEvent implements java.io.Serializable{
+public class LifeCycleLineEvent implements java.io.Serializable {
 
     /**
      * 绂佹淇敼杩欎釜鍊�
      */
     private static final long serialVersionUID = -842247029575668650L;
-    /**
-     * 涓婚敭
-     */
-	@TableId
-    private String oid;
 
     /**
      * 鎵�灞炵敓鍛藉懆鏈熻繛鎺ョ嚎涓婚敭
      */
-    private String pkLifeCycleLine;
+    private String pkLifeCycleEdge;
 
     /**
      * 浜嬩欢鐨勫叏璺緞
@@ -47,42 +44,46 @@
     /**
      * 鎺掑簭鍙�
      */
-    private Integer orderNum;
+    private Integer indexNum;
 
+	/**
+	 * 鎵�灞為鍩�
+	 */
+	private String bizDomain;
 
-    /**
-     * 涓氬姟绫诲瀷鍚嶇О
-     */
-    private String btmname;
+	/**
+	 * 涓婚敭
+	 */
+	@TableId
+	private String oid;
 
-    /**
-     * 鎷ユ湁鑰�
-     */
-    private String owner;
+	/**
+	 * 鍒涘缓浜�
+	 */
+	private String creator;
 
-    /**
-     * 鍒涘缓浜�
-     */
-    private String creator;
+	/**
+	 * 鍒涘缓鏃堕棿
+	 */
+	private Date createTime;
 
-    /**
-     * 鍒涘缓鏃堕棿
-     */
-    private Date createTime;
+	/**
+	 * 鏈�鍚庝慨鏀逛汉
+	 */
+	private String lastModifier;
 
-    /**
-     * 鏈�鍚庝慨鏀逛汉
-     */
-    private String lastModifier;
+	/**
+	 * 鏈�鍚庝慨鏀规椂闂达紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss
+	 */
+	private Date lastModifyTime;
 
-    /**
-     * 鏈�鍚庝慨鏀规椂闂达紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss
-     */
-    private Date lastModifyTime;
+	/**
+	 * 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
+	 */
+	@JsonFormat(
+		pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+	)
+	private Date ts;
 
-    /**
-     * 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
-     */
-    private Date ts;
 
 }

--
Gitblit v1.9.3