From 76ed3735c23da4b7ef97b8a0f365facbc14f6903 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期日, 27 六月 2021 16:05:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index b668a7b..be11475 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -86,6 +86,8 @@
     public ComEldersAuthUserService comEldersAuthUserService;
     @Resource
     private ComEldersAuthHistoryRecordMapper comEldersAuthHistoryRecordMapper;
+    @Resource
+    private ComActEasyPhotoActivityService comActEasyPhotoActivityService;
 
     /**
      * 新增社区活动
@@ -556,6 +558,15 @@
     }
 
     /**
+     * 查询随手拍是否有活动
+     * @return  活动详情
+     */
+    @PostMapping("getEasyPhotoActivity")
+    public R getEasyPhotoActivity(@RequestParam("communityId") Long communityId) {
+        return comActEasyPhotoActivityService.getEasyPhotoActivity(communityId);
+    }
+
+    /**
      * 发布微心愿
      *
      * @param comActMicroWishVO 发布内容

--
Gitblit v1.7.1