Merge remote-tracking branch 'origin/master'

doum

昨天 b613bb368d4e678b42d25e94397d0aab3e213438

 server/dmmall_service/src/main/java/com/doumee/service/business/ActivityService.java

@@ -5,6 +5,7 @@
import com.doumee.dao.business.model.Activity;
import com.doumee.dao.web.dto.activity.*;
import com.doumee.dao.web.request.ActivityPageListRequest;
import com.doumee.dao.web.request.goods.ArticleRequest;

import java.util.List;

@@ -184,4 +185,11 @@
    PageData<ActivityCardDTO> getUserFollowActivityCard(PageWrap pageWrap,Integer memberId);

    void updateLooknum(Activity model);


    PageData<Activity> getArticlePage(PageWrap<ArticleRequest> pageWrap);

    Activity getArticleInfo(Integer id, Integer memberId);


}