Merge remote-tracking branch 'origin/master'

rk

17 小时以前 511ce651667f5b2284247cc60599078b86f7963f

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