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 | 23 +++++++++++++++++++++++
1 files changed, 23 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 6cf38dc..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
@@ -1,11 +1,13 @@
package com.xcong.farmer.cms.modules.system.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.xcong.farmer.cms.common.system.base.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
+import java.util.List;
/**
* 文章表
@@ -76,4 +78,25 @@
//所属ID
private Long companyId;
+ private Integer type;
+
+ private String articleUrl;
+
+ //内容类型 1：文章 2：图片 3：文件 4：音频"
+ private Integer contentType;
+
+ @TableField(exist = false)
+ private String columnCode;
+
+ @TableField(exist = false)
+ private String columnName;
+
+ /**
+ * 栏目目录
+ */
+ @TableField(exist = false)
+ private String path;
+ @TableField(exist = false)
+ private List<Long> columnIds;
+
}
--
Gitblit v1.9.1