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 | 4 ++--
1 files changed, 2 insertions(+), 2 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 5e7af73..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
@@ -16,7 +16,7 @@
@Data
@EqualsAndHashCode(callSuper = true)
-public class TreeEntity extends BaseEntity {
+public class TreeEntity<T> extends BaseEntity {
private static final long serialVersionUID = 1L;
@@ -38,6 +38,6 @@
*/
@TableField(exist = false)
@ApiModelProperty(value = "瀛愰儴闂�")
- private List<?> children = new ArrayList<>();
+ private List<T> children = new ArrayList<>();
}
--
Gitblit v1.9.3