From b74faa19bd619213d4de8772b1816c2f87c29449 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 09 Aug 2022 15:44:50 +0800
Subject: [PATCH] Merge branch 'improve' of http://120.27.238.55:7000/r/farmer-cms into improve
---
src/main/java/com/xcong/farmer/cms/modules/system/vo/AdminArticleVo.java | 4 ++--
src/main/resources/mapper/ArticleMapper.xml | 17 ++++++++++++++++-
2 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 8b19cca..0939e5a 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
@@ -52,8 +52,8 @@
@ApiModelProperty(value = "是否立即发布 0：否 1：是")
private Integer releaseStatus;
- @ApiModelProperty(value = "文章详情")
- private String articleDetails;
+// @ApiModelProperty(value = "文章详情")
+// private String articleDetails;
@ApiModelProperty(value = "是否删除 0：已删除 1：未删除")
private Integer delStatus;
diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml
index 02ee778..eedc185 100644
--- a/src/main/resources/mapper/ArticleMapper.xml
+++ b/src/main/resources/mapper/ArticleMapper.xml
@@ -4,7 +4,22 @@
<select id="selectAdminArticleInPage" resultType="com.xcong.farmer.cms.modules.system.vo.AdminArticleVo">
SELECT
- a.*,
+ a.id,
+ a.title,
+ a.child_title childTitle,
+ a.author,
+ a.author_belong authorBelong,
+ a.remark,
+ a.column_id columnId,
+ a.visits,
+ a.main_diagram mainDiagram,
+ a.atlas,
+ a.release_time releaseTime,
+ a.is_top isTop,
+ a.release_status releaseStatus,
+ a.del_status delStatus,
+ a.type,
+ a.article_url articleUrl,
b.column_name columnName,
c.web_address baseUrl,
b.path path
--
Gitblit v1.9.1