From 56050aa6501f3d9d2f79a2c40a28815878ac56ee Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 24 十一月 2022 15:14:47 +0800
Subject: [PATCH] update 同步 ruoyi 相关提交 * fix 修复Log注解GET请求记录不到参数问题 * fix 修复某些特性的环境生成代码变乱码TXT文件问题 * update 消除Vue3控制台出现的警告信息 * fix 开启TopNav没有子菜单隐藏侧边栏 * fix 修复回显数据字典数组异常问题(I60UYQ) * update 忽略不必要的属性数据返回
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java | 10 ++--------
1 files changed, 2 insertions(+), 8 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 819e6b7..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 com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
import java.util.ArrayList;
import java.util.List;
@@ -17,8 +15,7 @@
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-public class TreeEntity extends BaseEntity {
+public class TreeEntity<T> extends BaseEntity {
private static final long serialVersionUID = 1L;
@@ -26,20 +23,17 @@
* 鐖惰彍鍗曞悕绉�
*/
@TableField(exist = false)
- @ApiModelProperty(value = "鐖惰彍鍗曞悕绉�")
private String parentName;
/**
* 鐖惰彍鍗旾D
*/
- @ApiModelProperty(value = "鐖惰彍鍗旾D")
private Long parentId;
/**
* 瀛愰儴闂�
*/
@TableField(exist = false)
- @ApiModelProperty(value = "瀛愰儴闂�")
- private List<?> children = new ArrayList<>();
+ private List<T> children = new ArrayList<>();
}
--
Gitblit v1.9.3