Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-05 ddb1636307f95763f31f0c869a52c8c1a8619b12

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

@@ -9,6 +9,7 @@
import javax.annotation.Resource;

import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.ActivityInviteDTO;
import com.panzhihua.common.model.dtos.community.PageActivityInviteDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
@@ -2803,8 +2804,8 @@
     * @return
     */
    @GetMapping("pageActivityBigScreen")
    public R pageActivityBigScreen(@RequestBody CommonPage commonPage){
        return comActActivityService.pageActivityBigScreen(commonPage);
    public R pageActivityBigScreen(@RequestBody PageBaseDTO pageBaseDTO){
        return comActActivityService.pageActivityBigScreen(pageBaseDTO);
    }

    @GetMapping("easyphoto/selectStatisticsPhoto")