From 9a1eb07f890b6a69812c6c1d62a305b06b18fb73 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 26 十一月 2024 18:01:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/domain/entity/FlowableType.java | 49 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/entity/FlowableType.java b/business/src/main/java/com/ycl/domain/entity/FlowableType.java
index fa18704..553b018 100644
--- a/business/src/main/java/com/ycl/domain/entity/FlowableType.java
+++ b/business/src/main/java/com/ycl/domain/entity/FlowableType.java
@@ -1,21 +1,28 @@
package com.ycl.domain.entity;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ycl.common.core.domain.BaseEntity;
+import com.ycl.common.core.domain.entity.SysMenu;
import com.ycl.system.domain.base.AbsEntity;
import lombok.Data;
+import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
* 娴佺▼鍒嗙被
*/
@Data
@TableName("t_flowable_type")
-public class FlowableType extends AbsEntity {
+public class FlowableType implements Serializable {
private static final long serialVersionUID = 1L;
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private Integer id;
@TableField(value = "name")
private String name;
@@ -23,17 +30,43 @@
@TableField(value = "parent_id")
private Integer parentId;
- @TableField(value = "level")
- private Integer level;
+ @TableField(value = "order_num")
+ private Integer orderNum;
- @TableField(value = "leaf")
- private Boolean leaf;
+// @TableField(value = "level")
+// private Integer level;
+//
+// @TableField(value = "leaf")
+// private Boolean leaf;
+ /**
+ * 鑿滃崟鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
+ */
+ @TableField(value = "status")
+ private String status;
+
+ /** 鍒涘缓鑰� */
@TableField(value = "create_by")
private String createBy;
+ /** 鍒涘缓鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(value = "create_time")
+ private Date createTime;
+
+ /** 鏇存柊鑰� */
@TableField(value = "update_by")
private String updateBy;
+ /** 鏇存柊鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(value = "update_time")
+ private Date updateTime;
+ /** 澶囨敞 */
+ @TableField(value = "remark")
+ private String remark;
+
+ @TableField(exist = false)
+ private List<FlowableType> children = new ArrayList<FlowableType>();
}
--
Gitblit v1.8.0