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

huanghongfa

2021-04-28 b618786e735dcfcb8c929e7e1239f06f00634a38

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java

@@ -1,6 +1,7 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleDO;
@@ -14,9 +15,16 @@

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

    /**
     * 管理后台查询邻里圈列表
     * @return
     */
    //R backstagePageNeighbor(ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);

}