Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-30 7a7c01d8ae0c0f2d7ffcaf8de5a7a1d49ba92c10

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java

@@ -1363,6 +1363,13 @@
    R getGridsMemberTrajectory(@RequestParam("communityId") Long communityId);

    /**
     * 西区大数据分析平台-综合治理栏
     * @return
     */
    @GetMapping("/screen/comprehensive/governance")
    R getComprehensiveGovernanceStatics();

    /**
     * 大屏-新根据小区id查询小区统计人数
     *
     * @param villageId