From df2af91da98ddf3cd12300a42d4b8b657d4ce54f Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期二, 27 四月 2021 13:51:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   17 +++++++++++++++++
 1 files changed, 17 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 7dd9a5a..cc25662 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
@@ -742,6 +742,15 @@
     @PostMapping("timedtaskactactivityall")
     R timedTaskActActivityAll();
 
+
+    /**
+     * 定时任务刷新社区活动的各个状态 除取消外
+     *
+     * @return
+     */
+    @PostMapping("timedtaskactmicrowishall")
+    R timedTaskActMicroWishAll();
+
     /**
      * 其他建筑详情
      *
@@ -1639,6 +1648,14 @@
     @PostMapping("/common/data/population/detail")
     R detailPopulation(@RequestParam(value = "populationId") Long populationId);
 
+    /**
+     * 根据id查询实有人口电子档案信息
+     * @param populationId  实有人口id
+     * @return  实有人口电子档信息
+     */
+    @PostMapping("/common/data/population/electronicArchives")
+    R electronicArchivesPopulation(@RequestParam(value = "populationId") Long populationId);
+
 
     /**
      * 根据id修改实有人口标签列表

--
Gitblit v1.7.1