From f2d86046f9b5a122e7593a95b6ff3ce911ac98b6 Mon Sep 17 00:00:00 2001
From: Null <281575458@qq.com>
Date: 星期四, 18 三月 2021 08:58:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
index 1f68a9b..613cb29 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.ComMngCarAppletDTO;
-import com.panzhihua.common.model.dtos.community.PageComActDTO;
import com.panzhihua.common.model.dtos.community.PageVolunteerDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
@@ -40,10 +39,12 @@
@Resource
private UserService userService;
- @ApiOperation(value = "分页查询社区",response = ComActVO.class)
- @PostMapping("pagecommunity")
- public R pageCommunity(@RequestBody PageComActDTO pageComActDTO){
- return communityService.pageCommunity(pageComActDTO);
+ @ApiOperation(value = "分页查询小区",response =ComMngStructAreaVO.class )
+ @PostMapping("pagearea")
+ public R pageArea(@RequestBody ComMngStructAreaVO comMngStructAreaVO){
+ Long communityId = this.getCommunityId();
+ comMngStructAreaVO.setCommunityId(communityId);
+ return communityService.pageArea(comMngStructAreaVO);
}
@ApiOperation(value = "分页获取社区动态",response = ComActDynVO.class)
--
Gitblit v1.7.1