Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-26 8da7ca5f5a5466c76b0d0abe23c7935e13e09136

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComPbCheckUnitFeign.java

@@ -109,7 +109,8 @@
    @GetMapping("/statistics/top")
    R unitStatisticsTop(@RequestParam(value = "communityId", required = false) Long communityId,
                        @RequestParam(value = "belongTo") String belongTo,
                        @RequestParam(value = "choice", required = false) String choice);
                        @RequestParam(value = "choice", required = false) String choice,
                        @RequestParam(value = "unitIds", required = false) Long[] unitIds);

    /**
     * 报到单位统计
@@ -131,7 +132,8 @@
    R pbStatisticsTop(@RequestParam(value = "communityId", required = false) Long communityId,
                      @RequestParam(value = "belongTo") String belongTo,
                      @RequestParam(value = "choice", required = false) String choice,
                      @RequestParam(value = "checkUnitId", required = false) Long checkUnitId);
                      @RequestParam(value = "checkUnitId", required = false) Long checkUnitId,
                      @RequestParam(value = "unitIds", required = false) Long[] unitIds);

    /**
     * 报到党员统计-按单位归属统计