Merge branch 'test'

DESKTOP-71BH0QO\L、ming

2021-04-28 15dbac0af6437e16b6606d5c790d614851493f02

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

@@ -25,6 +25,8 @@
     * 管理后台查询邻里圈列表
     * @return
     */
    //R backstagePageNeighbor(ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
    R pageNeighborByAdmin(ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);

    R addNeighborByAdmin();

}