From 19befbb8b6ba0f12f7fec0e597edd0f9bce3ec0f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 12 Jul 2022 11:39:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

---
 src/main/java/com/xcong/farmer/cms/conversion/ArticleConversion.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/farmer/cms/conversion/ArticleConversion.java b/src/main/java/com/xcong/farmer/cms/conversion/ArticleConversion.java
index cdb6610..9b65930 100644
--- a/src/main/java/com/xcong/farmer/cms/conversion/ArticleConversion.java
+++ b/src/main/java/com/xcong/farmer/cms/conversion/ArticleConversion.java
@@ -18,7 +18,9 @@
     @Mapping(source = "visits", target = "views")
     @Mapping(source = "mainDiagram", target = "thumb")
     @Mapping(source = "releaseTime", target = "createTime")
+    @Mapping(source = "authorBelong", target = "company")
     @Mapping(source = "articleDetails", target = "content")
     @Mapping(source = "uploadFile", target = "filePath")
+    @Mapping(source = "remark", target = "description")
     public abstract ArticleData entityToData(ArticleEntity article);
 }

--
Gitblit v1.9.1