Authored by chaogeng

Merge branch 'master' into test6.9.10

# Conflicts:
#	grass/src/main/java/com/yohobuy/platform/grass/service/impl/GrassArticleServiceImpl.java
@@ -729,6 +729,7 @@ public class GrassArticleServiceImpl implements IGrassArticleService { @@ -729,6 +729,7 @@ public class GrassArticleServiceImpl implements IGrassArticleService {
729 grassArticleLabelDao.updateByPrimaryKeySelective(grassArticleLabel); 729 grassArticleLabelDao.updateByPrimaryKeySelective(grassArticleLabel);
730 if(authStatus == 2){ 730 if(authStatus == 2){
731 //审核不通过时发送站内信通知 731 //审核不通过时发送站内信通知
  732 + req.setPublishTime(articleInfo.getCreateTime() + "");
732 sendInBoxMessageFroRecommendAndAuth(req , GrassInboxBusinessTypeEnum.SYSTEM_AUTH_ARTICLE.getBusinessType()); 733 sendInBoxMessageFroRecommendAndAuth(req , GrassInboxBusinessTypeEnum.SYSTEM_AUTH_ARTICLE.getBusinessType());
733 } 734 }
734 logger.info("updateArticle changeAuthStatus success! req={}", req); 735 logger.info("updateArticle changeAuthStatus success! req={}", req);