From b4c4f80a3c6f9f9fd6f4eb864e0568a9faba7529 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 16 九月 2021 11:06:07 +0800
Subject: [PATCH] Merge branch 'test_bak' into '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 58f4250..5e182ee 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
@@ -191,7 +191,7 @@
      * @return 详情
      */
     @PostMapping("detailactivity")
-    R detailActivity(@RequestParam("id") Long id, @RequestParam(value = "userId", required = false) Long userId);
+    R detailActivity(@RequestParam("id") Long id, @RequestParam(value = "userId", required = false) Long userId,@RequestParam(value = "pageNum", required = false) Long pageNum,@RequestParam(value = "pageSize", required = false) Long pageSize);
 
     /**
      * 分页活动报名名单
@@ -3635,6 +3635,26 @@
     R exportPensionAuthRecordsStatistic(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO);
 
     /**
+     * 查询养老认证社区认证方式 setPensionAuthType  查询养老认证社区认证方式
+     * @param    eldersAuthTypeQueryDTO   查询参数
+     * @return    R  查询结果
+     * @author txb
+     * @date 2021/9/10 16:03
+     */
+    @PostMapping("/elders/pensionAuthRecords/authtype")
+    R communityPensionAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO);
+
+    /**
+     * 设置当前社区养老认证方式:核验类型(1.视频认证 2.人脸核验) setPensionAuthType  设置当前社区养老认证方式:核验类型(1.视频认证 2.人脸核验)
+     * @param    communityId   社区id
+     * @param    type         检验类型
+     * @return    R  设置结果
+     * @author txb
+     * @date 2021/9/10 16:03
+     */
+    R setPensionAuthType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type);
+
+    /**
      * 小程序-查询疫苗分类列表
      *
      * @return 疫苗分类列表

--
Gitblit v1.7.1