Merge branch 'otc' of http://120.27.238.55:7000/r/exchange into otc

xiaoyong931011

2021-05-26 4ac9fb8e1f8ed5a3811cd3e3dc5a4223639867fc

 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);