Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-17 6e907cce72e42a349123800d697aa99f3360783e

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ConvenientElevatingPointService.java

@@ -49,4 +49,11 @@
     * @return
     */
    R detailPoint(Long pointId);

    /**
     * 根据商家查询范围内的提货点
     * @param merchantId
     * @return
     */
    R findPointByMerchantId(Long merchantId,String lat,String lng);
}