Merge remote-tracking branch 'origin/master'

rk

14 小时以前 bd491c37218b0b3d9b518e4814967d814e781c02

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