Merge remote-tracking branch 'origin/master'

doum

2 天以前 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1

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

@@ -98,10 +98,10 @@
     * @param comment 实体对象
     * @return long
     */
    Integer count(Comment comment);
    Long count(Comment comment);


    Integer count(Date start, Date end, Integer memberId);
    Long count(Date start, Date end, Integer memberId);


    /**