Merge remote-tracking branch 'origin/master'

doum

4 天以前 f4e09a3f13bbf63b166c3a149497a93a9fd43bc5

 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);
}