Merge branch 'bigscreen_dev'

101captain

2021-12-23 3a5655d1124cb56d7b7f045d18dd4855451507cc

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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.PageBaseDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.common.model.vos.community.StatisticsCommVO;
@@ -277,9 +278,9 @@

    /**
     * 微心愿大屏展示列表
     * @param communityId
     * @param pageSize
     * @param page
     * @param pageBaseDTO
     * @return
     */
    List<ComActMicroWishVO> selectScreenDisplayList(@Param("communityId") Long communityId, @Param("pageSize") Integer pageSize);
    IPage<ComActMicroWishVO> selectScreenDisplayList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
}