Merge branch 'local_20221115' into haucheng_panzhihua

yanghui

2022-12-02 a146d8f5d32045ffeef40be9782dfbe80121712b

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