From 5117fe2958a1bcec82e09fce01e49bb0bc2e0ba4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 14 十二月 2022 15:11:09 +0800
Subject: [PATCH] update 同步 ruoyi 相关提交 * fix 修复 文件名包含特殊字符（+、-、*...）的文件无法下载问题 * update 优化 弹窗内容过多展示不全问题 * update echarts 4.9.0 => 5.4.0 * fix 修复 Vue3树形下拉不能默认选中 * update 优化 删除fuse无效选项maxPatternLength * fix 修复 代码生成图片/文件/单选时选择必填无法校验问题 * fix 修复 修改参数键名时 未移除过期缓存配置
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java | 55 +++++++++++++++++++------------------------------------
1 files changed, 19 insertions(+), 36 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 8db10aa..c7bb9b4 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
@@ -1,10 +1,8 @@
package com.ruoyi.common.core.domain;
-import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
import java.util.ArrayList;
import java.util.List;
@@ -12,45 +10,30 @@
/**
* Tree鍩虹被
*
- * @author ruoyi
+ * @author Lion Li
*/
-@EqualsAndHashCode(callSuper = true)
@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-public class TreeEntity extends BaseEntity {
+@EqualsAndHashCode(callSuper = true)
+public class TreeEntity<T> extends BaseEntity {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 鐖惰彍鍗曞悕绉�
- */
- @ApiModelProperty(value = "鐖惰彍鍗曞悕绉�")
- private String parentName;
+ /**
+ * 鐖惰彍鍗曞悕绉�
+ */
+ @TableField(exist = false)
+ private String parentName;
- /**
- * 鐖惰彍鍗旾D
- */
- @ApiModelProperty(value = "鐖惰彍鍗旾D")
- private Long parentId;
+ /**
+ * 鐖惰彍鍗旾D
+ */
+ private Long parentId;
- /**
- * 鏄剧ず椤哄簭
- */
- @ApiModelProperty(value = "鏄剧ず椤哄簭")
- private Integer orderNum;
-
- /**
- * 绁栫骇鍒楄〃
- */
- @ApiModelProperty(value = "绁栫骇鍒楄〃")
- private String ancestors;
-
- /**
- * 瀛愰儴闂�
- */
- @ApiModelProperty(value = "瀛愰儴闂�")
- private List<?> children = new ArrayList<>();
+ /**
+ * 瀛愰儴闂�
+ */
+ @TableField(exist = false)
+ private List<T> children = new ArrayList<>();
}
--
Gitblit v1.9.3