merge

@@ -144,7 +144,7 @@ public class TopicServiceImpl implements ITopicService {
         record.setId(id);
         record.setIsHot(isHot);
         grassTopicDAO.updateByPrimaryKeySelective(record);
-        logger.info("changeTopicHotStatus success! req={}",req);
+        logger.info("changeTopicHotStatus success! req={}", req);
         return new ApiResponse.ApiResponseBuilder().code(200).build();
     }
 
@@ -158,7 +158,7 @@ public class TopicServiceImpl implements ITopicService {
         List<GrassTopic> topicList = grassTopicDAO.selectTopicByGroupId(groupId);
         List<TopicRespBo> rsp = Lists.newArrayList();
         topicList.forEach(grassTopic -> {
-            TopicRespBo rspbo =  new TopicRespBo();
+            TopicRespBo rspbo = new TopicRespBo();
             rspbo.setId(grassTopic.getId());
             rspbo.setTopicName(grassTopic.getTopicName());
             rsp.add(rspbo);
@@ -209,7 +209,7 @@ public class TopicServiceImpl implements ITopicService {
             logger.warn("addArticlesTop with topicId null");
             return new ApiResponse(201,"话题id不可为空！");
         }
-        int updateTime = DateUtil.getCurrentTimeSeconds();
+        long updateTime = System.currentTimeMillis();
         if(StringUtils.isEmpty(req.getTopArticleIds())){
             //该种情况取消该话题下的置顶
             articleTopicDao.updateTopByTopicId(req.getId(),updateTime);