Merge branch 'master' into test

puhanshu

2021-12-29 ca4034c3a285f2c22fa19e5eaa88d505b5588c0b

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenServiceImpl.java

@@ -123,8 +123,8 @@
    }

    @Override
    public R partyActivityTop(Long communityId) {
        return R.ok(this.comPbMemberDAO.selectActivityTop(communityId));
    public R partyActivityTop(PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg) {
        return R.ok(this.comPbMemberDAO.selectActivityTop(new Page(pageBigScreenStatisticPartyOrg.getPageNum(),pageBigScreenStatisticPartyOrg.getPageSize()),pageBigScreenStatisticPartyOrg.getCommunityId()));
    }

    @Override