From d56a4ae3aded7fecbecf98d33557f28dedc3abc6 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 05 十二月 2022 16:57:43 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   22 +++++++++++++++++++++-
 1 files changed, 21 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 9d31f0c..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,27 @@
      * @return
      */
     @PostMapping("pageActivityBigScreen")
-    R pageActivityBigScreen(@RequestBody CommonPage commonPage);
+    R pageActivityBigScreen(@RequestBody PageBaseDTO pageBaseDTO);
+
+    /**
+     * 疫情防控 健康码统计
+     * @return
+     */
+    @GetMapping("/comActAcidRecord/selectColorMarkGroup")
+    R selectColorMarkGroup();
+
+
+    @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