Merge remote-tracking branch 'origin/master'

doum

2 天以前 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1

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

@@ -96,7 +96,7 @@
     * @param zan 实体对象
     * @return long
     */
    Integer count(Zan zan);
    long count(Zan zan);

    Map<Integer, ZanDTO> count(List<Integer> objIds);