From 2720d8d8e2ea1a03e6dd42809d75f788349f66c8 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Wed, 12 May 2021 16:34:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/activity' into activity

---
 src/main/java/com/xcong/excoin/modules/activity/service/impl/ActivityServiceImpl.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/activity/service/impl/ActivityServiceImpl.java b/src/main/java/com/xcong/excoin/modules/activity/service/impl/ActivityServiceImpl.java
index e94540f..1c7be54 100644
--- a/src/main/java/com/xcong/excoin/modules/activity/service/impl/ActivityServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/activity/service/impl/ActivityServiceImpl.java
@@ -86,6 +86,7 @@
 			ActivityMain activityMain = activityMainDao.selectOne(queryWrappers);
 			if(ObjectUtil.isNotEmpty(activityMain)) {
 				activityMainVo.setId(activityMain.getId());
+                activityMainVo.setHtmlImg(activityMain.getHtmlImg());
 			}
 		}
         return Result.ok(activityMainVo);

--
Gitblit v1.9.1