From c636e6909b8ed1dc1dba18bceca2554d5adde7f9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 21 一月 2022 18:29:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'ruoyi-vue/master' into dev
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java | 53 +++++++++++++++++++++--------------------------------
1 files changed, 21 insertions(+), 32 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..819e6b7 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,45 +12,34 @@
/**
* Tree鍩虹被
*
- * @author ruoyi
+ * @author Lion Li
*/
-@EqualsAndHashCode(callSuper = true)
@Data
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
public class TreeEntity extends BaseEntity {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 鐖惰彍鍗曞悕绉�
- */
- @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 Integer orderNum;
-
- /**
- * 绁栫骇鍒楄〃
- */
- @ApiModelProperty(value = "绁栫骇鍒楄〃")
- private String ancestors;
-
- /**
- * 瀛愰儴闂�
- */
- @ApiModelProperty(value = "瀛愰儴闂�")
- private List<?> children = new ArrayList<>();
+ /**
+ * 瀛愰儴闂�
+ */
+ @TableField(exist = false)
+ @ApiModelProperty(value = "瀛愰儴闂�")
+ private List<?> children = new ArrayList<>();
}
--
Gitblit v1.9.3