Merge remote-tracking branch 'origin/master'

doum

昨天 b613bb368d4e678b42d25e94397d0aab3e213438

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

@@ -94,4 +94,8 @@
     * @return long
     */
    long count(SearchHistory searchHistory);

    List<SearchHistory> findListByType(Integer type,Integer memberId);

    void cleanHistory(Integer type,Integer memberId);
}