Merge branch 'haucheng_panzhihua' into huacheng_test

101captain

2022-08-03 33fdf147bdaa73d2f97479d809597a99ad50a8bb

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java

@@ -1199,7 +1199,7 @@

    @Override
    public R selectCount(Integer type, String phone,Long communityId) {
        return R.ok(this.baseMapper.selectCount(type,phone));
        return R.ok(this.baseMapper.selectCount(type,phone,communityId));
    }

    /**