Merge remote-tracking branch 'origin/master'

doum

昨天 ed8eeb20e85871b44b5a0d51b96f5efa43d14d56

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

@@ -176,7 +176,7 @@
    }

    @Override
    public Integer count(ShopFollow shopFollow) {
    public long count(ShopFollow shopFollow) {
        QueryWrapper<ShopFollow> wrapper = new QueryWrapper<>(shopFollow);
        return shopFollowMapper.selectCount(wrapper);
    }