Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-01 1daff9a8151820980da082ece4c923f946ff8028

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

@@ -3527,7 +3527,7 @@
     *            请求参数
     * @return 邻里圈列表
     */
    @PostMapping("/neighbor/pageNeighborByAdmin")
    @PostMapping("/neighbor/pageNeighborByBigScreen")
    R pageNeighborByBigScreen(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
    /**
     * 后台修改邻里圈
@@ -11150,5 +11150,16 @@
    @PostMapping("pageActivityBigScreen")
    R pageActivityBigScreen(@RequestBody CommonPage commonPage);

    /**
     * 疫情防控 健康码统计
     * @return
     */
    @GetMapping("/comActAcidRecord/selectColorMarkGroup")
    R selectColorMarkGroup();


    @GetMapping("easyphoto/selectStatisticsPhoto")
    R selectStatisticsPhoto();


}