From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveAnswerContentMapper.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveAnswerContentMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveAnswerContentMapper.java
index 4c2cfe7..f459aa7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveAnswerContentMapper.java
+++ b/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);
 
     /**
      * 分页查询用户填写某预约登记记录列表
@@ -42,4 +43,6 @@
      */
     List<ComActReserveRegisterDetailedAnswerVO> getRegisterDetailedAnswerList(@Param("reserveRecordId")Long reserveRecordId);
 
+    ComActReserveRegisterDetailedVO getRegisterDetailedById(@Param("reserveRecordId") Long reserveRecordId);
+
 }

--
Gitblit v1.7.1