Merge branch 'bigscreen_dev'

101captain

2021-12-23 3a5655d1124cb56d7b7f045d18dd4855451507cc

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireDAO.java

@@ -2,6 +2,7 @@

import java.util.List;

import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.vos.community.ComActQuestnaireVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenQuestionnaireStatisticsInfo;
@@ -142,9 +143,9 @@

    /**
     * 大屏问卷展示列表
     * @param communityId
     * @param pageSize
     * @param page
     * @param pageBaseDTO
     * @return
     */
    List<ComActQuestnaireVO> selectQuestionnaireDisplayList(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);
    IPage<ComActQuestnaireVO> selectQuestionnaireDisplayList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
}