Merge branch 'test' into 'master'

罗yu 元桥

2021-04-28 6c3dcdcb89e181aac47e60a001dbe9e8921c8e79

 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;
@@ -2238,4 +2239,12 @@
    @PostMapping("/delectworkguide")
    R delectWorkGuide(@RequestParam("workGuideId") Long workGuideId);

    /**
     * 分页查询邻里圈
     * @param neighborCircleAppDTO  请求参数
     * @return  邻里圈列表
     */
    @PostMapping("/neighbor/pageNeighborByApp")
    R pageNeighborByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);

}