Merge remote-tracking branch 'origin/master'

doum

21 小时以前 ed8eeb20e85871b44b5a0d51b96f5efa43d14d56

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