From e703d415ff36584518a76d4d26363bfd1556b43b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 05 Jul 2022 12:01:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms
---
src/main/java/com/xcong/farmer/cms/modules/system/entity/ArticleEntity.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 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 cf303de..5403f5b 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;
/**
* 文章表
@@ -30,6 +32,14 @@
*/
public static final Integer DELETE_STATUS_YES = 0;
/**
+ * 设置成热门文章 0：否
+ */
+ public static final Integer ISTOP_NO = 0;
+ /**
+ * 设置成热门文章 1：是
+ */
+ public static final Integer ISTOP_YES = 1;
+ /**
* 访问量
*/
public static final Integer VISITS_DEFAULT = 0;
@@ -40,6 +50,8 @@
private String childTitle;
//作者
private String author;
+ //作者所属单位
+ private String authorBelong;
//描述
private String remark;
//所属栏目ID
@@ -51,13 +63,35 @@
//图集
private String atlas;
//发布时间
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date releaseTime;
+ //设置成热门文章 0：否 1：是
+ private Integer isTop;
//是否立即发布 0：否 1：是
private Integer releaseStatus;
//文章详情
private String articleDetails;
+ //上传附件
+ private String uploadFile;
//是否删除 0：已删除 1：未删除
private Integer delStatus;
+ //所属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 List<Long> columnIds;
}
--
Gitblit v1.9.1