From 67494eba4305d6e5c95079d17c5b6bcd8489df82 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期四, 09 九月 2021 10:17:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 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 4dc3704..4a699c8 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
@@ -407,6 +407,16 @@
     R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO);
 
     /**
+     * 小程序分页查询微心愿
+     *
+     * @param comActMicroWishVO
+     *            查询参数
+     * @return 分页集合
+     */
+    @PostMapping("pagemicrowish/applets")
+    R pageMicroWishApplets(@RequestBody ComActMicroWishVO comActMicroWishVO);
+
+    /**
      * 心愿详情
      *
      * @param id
@@ -5411,4 +5421,12 @@
      */
     @GetMapping("/listworkguide/classify")
     R listWorkGuideByClassifyId(@RequestParam("classifyId") Long classifyId);
+
+    /**
+     * 小程序查询所有进行中的预约登记
+     * @param communityId   社区id
+     * @return  社区所有进行中的预约登记列表
+     */
+    @GetMapping("/reserve/list")
+    R reserveListApplets(@RequestParam("communityId") Long communityId);
 }

--
Gitblit v1.7.1