From 5e7892cd0921111dfbaf84196f2593f8045d1c11 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 13:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 91600ef..e97688b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -11148,7 +11148,7 @@
      * @return
      */
     @PostMapping("pageActivityBigScreen")
-    R pageActivityBigScreen(@RequestBody CommonPage commonPage);
+    R pageActivityBigScreen(@RequestBody PageBaseDTO pageBaseDTO);
 
     /**
      * 疫情防控 健康码统计
@@ -11161,5 +11161,14 @@
     @GetMapping("easyphoto/selectStatisticsPhoto")
     R selectStatisticsPhoto();
 
+    /**
+     * 获取商家周围 n(km)的自提点数量
+     *
+     * @param distance
+     * @return
+     */
+    @GetMapping("/convenient/point/findPointNumByDistance")
+    R findPointNumByDistance(@RequestParam("distance") Integer distance, @RequestParam("lat") String lat, @RequestParam("lng") String lng);
+
 
 }

--
Gitblit v1.7.1