From e7f9932f6d5bb67dac0de33e9d52d439d9a1a6bf Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 08 Jul 2022 09:57:05 +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/vo/AdminArticleVo.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminArticleVo.java b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminArticleVo.java
index 65888e3..27c7952 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminArticleVo.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminArticleVo.java
@@ -18,14 +18,20 @@
@ApiModelProperty(value = "标题")
private String childTitle;
+ @ApiModelProperty(value = "作者")
+ private String author;
+
+ @ApiModelProperty(value = "作者所属单位")
+ private String authorBelong;
+
@ApiModelProperty(value = "描述")
- private String describe;
+ private String remark;
@ApiModelProperty(value = "所属栏目ID")
private Long columnId;
@ApiModelProperty(value = "所属栏目名称")
- private Long columnName;
+ private String columnName;
@ApiModelProperty(value = "访问量")
private Integer visits;
@@ -37,8 +43,11 @@
private String atlas;
@ApiModelProperty(value = "发布时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date releaseTime;
+
+ @ApiModelProperty(value = "设置成热门文章 0：否 1：是")
+ private Integer isTop;
@ApiModelProperty(value = "是否立即发布 0：否 1：是")
private Integer releaseStatus;
@@ -48,4 +57,10 @@
@ApiModelProperty(value = "是否删除 0：已删除 1：未删除")
private Integer delStatus;
+
+ @ApiModelProperty(value = "1-站内 2-外部链接")
+ private Integer type;
+
+ @ApiModelProperty(value = "外部链接地址")
+ private String articleUrl;
}
--
Gitblit v1.9.1