From 43c6e133a84d50f4952cd1df2f409d07be338cc4 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 28 四月 2021 13:18:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
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 2f5d2c0..424c942 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
@@ -5,6 +5,7 @@
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
@@ -1648,6 +1649,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修改实有人口标签列表
@@ -2230,4 +2239,12 @@
@PostMapping("/delectworkguide")
R delectWorkGuide(@RequestParam("workGuideId") Long workGuideId);
+ /**
+ * 分页查询邻里圈
+ * @param neighborCircleAppDTO 请求参数
+ * @return 邻里圈列表
+ */
+ @PostMapping("/neighbor/pageNeighbor")
+ R pageNeighbor(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);
+
}
--
Gitblit v1.7.1