From d3abd6c96e99e32ccfc030230e06ce4b529f2bbd Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 17 八月 2021 10:38:07 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java | 49 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 35 insertions(+), 14 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 43d1efe..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
@@ -4,16 +4,15 @@
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
+
import java.io.Serializable;
import java.util.Date;
-import java.math.BigDecimal;
-import com.ruoyi.common.annotation.Excel;
/**
* 娴嬭瘯鏍戣〃瀵硅薄 test_tree
*
* @author Lion Li
- * @date 2021-05-30
+ * @date 2021-07-26
*/
@Data
@NoArgsConstructor
@@ -24,43 +23,65 @@
private static final long serialVersionUID=1L;
- /** 涓婚敭 */
+ /**
+ * 涓婚敭
+ */
@TableId(value = "id")
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