Merge branch 'dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into dev

101captain

2022-03-09 b2a5e4be739b232876b87e65ed70fa5186943d1e

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

@@ -283,4 +283,20 @@
     * @return
     */
    IPage<ComActMicroWishVO> selectScreenDisplayList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);

    /**
     * 金沙定制页面-志愿线展示列表
     * @param page
     * @param pageBaseDTO
     * @return
     */
    IPage<ComActMicroWishVO> pagePartyBuildIngMicroWish(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);

    /**
     * 金沙定制页面-四长四员解决问题展示列表
     * @param page
     * @param pageBaseDTO
     * @return
     */
    IPage<ComActMicroWishVO> pageFourMemberResolve(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
}