Merge remote-tracking branch 'origin/test' into test

DESKTOP-71BH0QO\L、ming

2021-04-28 7ea43dac46900dab7535bdd3ec957b45e43b5270

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -6,7 +6,9 @@
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
@@ -2249,6 +2251,22 @@
    R pageNeighborByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);

    /**
     * 用户发布邻里圈审核
     * @param addNeighborCircleAppDTO   邻里圈请求参数
     * @return  发布结果
     */
    @PostMapping("/neighbor/addNeighborByApp")
    R addNeighborByApp(@RequestBody AddComActNeighborCircleAppDTO addNeighborCircleAppDTO);

    /**
     * 用户查看邻里圈详情
     * @param neighborCircleAppDTO  请求参数
     * @return  邻里圈详情
     */
    @PostMapping("/neighbor/neighborDetailByApp")
    R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO);

    /**
     * 管理后台查询邻里圈列表
     * @param comActNeighborCircleAdminDTO  请求参数
     * @return  邻里圈列表