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 d580f027..7a0efe62 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 @@ -18,6 +18,9 @@ public class TreeEntity extends BaseEntity /** 显示顺序 */ private Integer orderNum; + /** 祖级列表 */ + private String ancestors; + public String getParentName() { return parentName; @@ -47,4 +50,14 @@ public class TreeEntity extends BaseEntity { this.orderNum = orderNum; } + + public String getAncestors() + { + return ancestors; + } + + public void setAncestors(String ancestors) + { + this.ancestors = ancestors; + } } \ No newline at end of file diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java index bb912ed4..56fef67a 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java @@ -325,7 +325,11 @@ public class GenTableColumn extends BaseEntity public static boolean isSuperColumn(String javaField) { - return StringUtils.equalsAnyIgnoreCase(javaField, "createBy", "createTime", "updateBy", "updateTime", "remark"); + return StringUtils.equalsAnyIgnoreCase(javaField, + //BaseEntity + "createBy", "createTime", "updateBy", "updateTime", "remark", + //TreeEntity + "parentName", "parentId", "orderNum", "ancestors"); } public String readConverterExp()