Merge remote-tracking branch 'origin/master'

doum

昨天 ed8eeb20e85871b44b5a0d51b96f5efa43d14d56

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