Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-05 f80afdbc853857579ef24f6e679bde4be8b57e39

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

@@ -1303,4 +1303,9 @@
        }
        return partyActivityLines;
    }

    @Override
    public R pageActivityBigScreen(CommonPage commonPage) {
        return R.ok(comActActivityDAO.pageActivityBigScreen(new Page<>(commonPage.getPage(),commonPage.getSize())));
    }
}