From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java | 21 +++++----------------
1 files changed, 5 insertions(+), 16 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..c0e62c7 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,9 +1,9 @@
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.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.util.ArrayList;
@@ -12,12 +12,11 @@
/**
* Tree鍩虹被
*
- * @author ruoyi
+ * @author Lion Li
*/
-@EqualsAndHashCode(callSuper = true)
@Data
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
public class TreeEntity extends BaseEntity {
@@ -26,6 +25,7 @@
/**
* 鐖惰彍鍗曞悕绉�
*/
+ @TableField(exist = false)
@ApiModelProperty(value = "鐖惰彍鍗曞悕绉�")
private String parentName;
@@ -36,20 +36,9 @@
private Long parentId;
/**
- * 鏄剧ず椤哄簭
- */
- @ApiModelProperty(value = "鏄剧ず椤哄簭")
- private Integer orderNum;
-
- /**
- * 绁栫骇鍒楄〃
- */
- @ApiModelProperty(value = "绁栫骇鍒楄〃")
- private String ancestors;
-
- /**
* 瀛愰儴闂�
*/
+ @TableField(exist = false)
@ApiModelProperty(value = "瀛愰儴闂�")
private List<?> children = new ArrayList<>();
--
Gitblit v1.9.3