Merge branch 'test' into 'master'

罗元桥

2021-08-31 b9b493e3da134f8e4eb36e5b831063fd27fef417

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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.reserve.PageReserveRegisterDetailedAdminDTO;
import com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterDetailedAnswerVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterDetailedVO;
import com.panzhihua.service_community.model.dos.ComActReserveAnswerContentDO;
@@ -25,7 +26,7 @@
     * @param reserveId 预约登记id
     * @return  登记类答案记录列表
     */
    List<ComActReserveAnswerContentDO> selectListByReserve(@Param("reserveId")Long reserveId);
    List<ComActQuestnaireAnswerContentVO> selectListByReserve(@Param("reserveId")Long reserveId);

    /**
     * 分页查询用户填写某预约登记记录列表