Merge branch 'master' into test

puhanshu

2021-12-29 ca4034c3a285f2c22fa19e5eaa88d505b5588c0b

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/BigScreenApi.java

@@ -98,11 +98,11 @@

    /**
     * 党员积分前3
     * @param communityId
     * @param pageBigScreenStatisticPartyOrg
     * @return
     */
    @GetMapping("/partyActivityTop")
    public R partyActivityTop(@RequestParam("communityId")Long communityId){
        return bigScreenService.partyActivityTop(communityId);
    @PostMapping("/partyActivityTop")
    public R partyActivityTop(@RequestBody PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg){
        return bigScreenService.partyActivityTop(pageBigScreenStatisticPartyOrg);
    }
}