Merge branch 'test' into 'master'

罗yu 元桥

2021-04-28 6c3dcdcb89e181aac47e60a001dbe9e8921c8e79

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java

@@ -19,16 +19,16 @@
 */
@Slf4j
@Service
public class ComActNeighborCircleServiceImpl extends ServiceImpl<ComActNeighborCircleDAO, ComActNeighborCircleDO> implements ComActNeighborCircleService {
public abstract class ComActNeighborCircleServiceImpl extends ServiceImpl<ComActNeighborCircleDAO, ComActNeighborCircleDO> implements ComActNeighborCircleService {

    /**
     * 分页查询邻里圈列表
     * @param neighborCircleAppDTO  请求参数
     * @return  邻里圈列表
     */
    public R pageNeighbor(ComActNeighborCircleAppDTO neighborCircleAppDTO){
    public R pageNeighborByApp(ComActNeighborCircleAppDTO neighborCircleAppDTO){
        Page userPage = new Page(neighborCircleAppDTO.getPageNum(), neighborCircleAppDTO.getPageSize());
        IPage<ComActNeighborCircleAppVO> doPager = this.baseMapper.pageNeighbor(userPage, neighborCircleAppDTO);
        IPage<ComActNeighborCircleAppVO> doPager = this.baseMapper.pageNeighborByApp(userPage, neighborCircleAppDTO);
        return R.ok(doPager);
    }