From 7e25a80c5bcb45ed9524a57e24bcabd0a0db625d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 24 四月 2022 11:46:25 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java | 46 +++++++++++++++++++---------------------------
1 files changed, 19 insertions(+), 27 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
index f192263..f44eacd 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java
@@ -4,7 +4,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
import java.util.ArrayList;
import java.util.List;
@@ -17,35 +16,28 @@
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-public class TreeEntity extends BaseEntity {
+public class TreeEntity<T> extends BaseEntity {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 鐖惰彍鍗曞悕绉�
- */
- @TableField(exist = false)
- @ApiModelProperty(value = "鐖惰彍鍗曞悕绉�")
- private String parentName;
+ /**
+ * 鐖惰彍鍗曞悕绉�
+ */
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鐖惰彍鍗曞悕绉�")
+ private String parentName;
- /**
- * 鐖惰彍鍗旾D
- */
- @ApiModelProperty(value = "鐖惰彍鍗旾D")
- private Long parentId;
+ /**
+ * 鐖惰彍鍗旾D
+ */
+ @ApiModelProperty(value = "鐖惰彍鍗旾D")
+ private Long parentId;
- /**
- * 鏄剧ず椤哄簭
- */
- @ApiModelProperty(value = "鏄剧ず椤哄簭")
- private String orderNum;
-
- /**
- * 瀛愰儴闂�
- */
- @TableField(exist = false)
- @ApiModelProperty(value = "瀛愰儴闂�")
- private List<?> children = new ArrayList<>();
+ /**
+ * 瀛愰儴闂�
+ */
+ @TableField(exist = false)
+ @ApiModelProperty(value = "瀛愰儴闂�")
+ private List<T> children = new ArrayList<>();
}
--
Gitblit v1.9.3