From eb2be90e74adfa06ee251f80c08243d0301ce467 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 28 七月 2021 10:49:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev'
---
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java | 49 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java
index b9bd2ba..799a6d4 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java
@@ -1,8 +1,6 @@
package com.ruoyi.demo.domain;
import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
@@ -14,7 +12,7 @@
* 娴嬭瘯鏍戣〃瀵硅薄 test_tree
*
* @author Lion Li
- * @date 2021-05-30
+ * @date 2021-07-26
*/
@Data
@NoArgsConstructor
@@ -25,44 +23,65 @@
private static final long serialVersionUID=1L;
- /** 涓婚敭 */
+ /**
+ * 涓婚敭
+ */
@TableId(value = "id")
- @JsonSerialize(using = ToStringSerializer.class)
private Long id;
- /** 鐖秈d */
+ /**
+ * 鐖秈d
+ */
private Long parentId;
- /** 閮ㄩ棬id */
+ /**
+ * 閮ㄩ棬id
+ */
private Long deptId;
- /** 鐢ㄦ埛id */
+ /**
+ * 鐢ㄦ埛id
+ */
private Long userId;
- /** 鏍戣妭鐐瑰悕 */
+ /**
+ * 鏍戣妭鐐瑰悕
+ */
private String treeName;
- /** 鐗堟湰 */
+ /**
+ * 鐗堟湰
+ */
@Version
private Long version;
- /** 鍒涘缓鏃堕棿 */
+ /**
+ * 鍒涘缓鏃堕棿
+ */
@TableField(fill = FieldFill.INSERT)
private Date createTime;
- /** 鍒涘缓浜� */
+ /**
+ * 鍒涘缓浜�
+ */
@TableField(fill = FieldFill.INSERT)
private String createBy;
- /** 鏇存柊鏃堕棿 */
+ /**
+ * 鏇存柊鏃堕棿
+ */
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
- /** 鏇存柊浜� */
+ /**
+ * 鏇存柊浜�
+ */
@TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
- /** 鍒犻櫎鏍囧織 */
+ /**
+ * 鍒犻櫎鏍囧織
+ */
@TableLogic
private Long delFlag;
--
Gitblit v1.9.3