From b95699652357c6218b45eceb81170ddfebb30e1d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 05 Jul 2022 16:06:25 +0800
Subject: [PATCH] fix conflect
---
src/main/java/com/xcong/farmer/cms/modules/system/entity/ArticleEntity.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/entity/ArticleEntity.java b/src/main/java/com/xcong/farmer/cms/modules/system/entity/ArticleEntity.java
index 8d7bab7..d258867 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/entity/ArticleEntity.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/entity/ArticleEntity.java
@@ -7,6 +7,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
+import java.util.List;
/**
* 文章表
@@ -90,4 +91,12 @@
@TableField(exist = false)
private String columnName;
+ /**
+ * 栏目目录
+ */
+ @TableField(exist = false)
+ private String path;
+ @TableField(exist = false)
+ private List<Long> columnIds;
+
}
--
Gitblit v1.9.1