Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-05 ddb1636307f95763f31f0c869a52c8c1a8619b12

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActActivityService.java

@@ -3,6 +3,7 @@
import java.util.List;

import com.baomidou.mybatisplus.extension.service.IService;
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.community.bigscreen.work.ScreenActActivityListDTO;
@@ -335,5 +336,5 @@
     * @param commonPage
     * @return
     */
    R pageActivityBigScreen(CommonPage commonPage);
    R pageActivityBigScreen(PageBaseDTO pageBaseDTO);
}