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/conversion/ColumnConversion.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/farmer/cms/conversion/ColumnConversion.java b/src/main/java/com/xcong/farmer/cms/conversion/ColumnConversion.java
index a9dd7f7..f8a3217 100644
--- a/src/main/java/com/xcong/farmer/cms/conversion/ColumnConversion.java
+++ b/src/main/java/com/xcong/farmer/cms/conversion/ColumnConversion.java
@@ -1,6 +1,8 @@
 package com.xcong.farmer.cms.conversion;
 
+import com.xcong.farmer.cms.core.tag.data.ColumnData;
 import com.xcong.farmer.cms.core.tag.data.NavData;
+import com.xcong.farmer.cms.core.tag.model.Column;
 import com.xcong.farmer.cms.modules.system.entity.ColumnEntity;
 import com.xcong.farmer.cms.modules.test.mapper.TestUserEntityMapper;
 import org.mapstruct.Mapper;
@@ -24,4 +26,11 @@
     public abstract NavData columnToNav(ColumnEntity column);
 
     public abstract List<NavData> columnsToNavs(List<ColumnEntity> column);
+
+    @Mapping(target = "title", source = "columnName")
+    @Mapping(target = "code", source = "columnCode")
+    @Mapping(target = "image", source = "pic")
+    public abstract ColumnData entityToData(ColumnEntity column);
+
+    public abstract List<ColumnData> entitiesToDatas(List<ColumnEntity> list);
 }

--
Gitblit v1.9.1