Merge remote-tracking branch 'origin/master'

doum

17 小时以前 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1

 server/dmmall_service/src/main/java/com/doumee/service/business/impl/CollectServiceImpl.java

@@ -158,7 +158,7 @@
    }

    @Override
    public Integer count(Collect collect) {
    public Long count(Collect collect) {
        QueryWrapper<Collect> wrapper = new QueryWrapper<>(collect);
        return collectMapper.selectCount(wrapper);
    }