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/conversion/ArticleConversion.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 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
new file mode 100644
index 0000000..cdb6610
--- /dev/null
+++ b/src/main/java/com/xcong/farmer/cms/conversion/ArticleConversion.java
@@ -0,0 +1,24 @@
+package com.xcong.farmer.cms.conversion;
+
+import com.xcong.farmer.cms.core.tag.data.ArticleData;
+import com.xcong.farmer.cms.modules.system.entity.ArticleEntity;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * @author wzy
+ * @date 2022-07-05
+ **/
+@Mapper
+public abstract class ArticleConversion {
+    public static ArticleConversion INSTANCE = Mappers.getMapper(ArticleConversion.class);
+
+    @Mapping(source = "childTitle", target = "subTitle")
+    @Mapping(source = "visits", target = "views")
+    @Mapping(source = "mainDiagram", target = "thumb")
+    @Mapping(source = "releaseTime", target = "createTime")
+    @Mapping(source = "articleDetails", target = "content")
+    @Mapping(source = "uploadFile", target = "filePath")
+    public abstract ArticleData entityToData(ArticleEntity article);
+}

--
Gitblit v1.9.1