Merge remote-tracking branch 'origin/master'

doum

昨天 b613bb368d4e678b42d25e94397d0aab3e213438

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

@@ -97,5 +97,5 @@
     */
    long count(Shares shares);

    Integer count(Date start,Date end, Integer memberId,List<Integer> types);
    long count(Date start,Date end, Integer memberId,List<Integer> types);
}