Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-28 23802c625b4f78dbd30db82d1b9e5a839b4071c0

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

@@ -120,7 +120,7 @@
    }

    @Override
    public R getSuitableServiceCategories(Long communityId) {
        return R.ok(this.baseMapper.selectSuitableServiceCategories(communityId));
    public R getSuitableServiceCategories(Long communityId,String areaCode) {
        return R.ok(this.baseMapper.selectSuitableServiceCategories(communityId,areaCode));
    }
}