From 147a7ce2b1cc45cb58c69c82c3b0e0b2d3910b05 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期五, 03 九月 2021 18:13:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireAnswerContentDAO.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireAnswerContentDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireAnswerContentDAO.java
index 3ca0c87..c02d690 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireAnswerContentDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActQuestnaireAnswerContentDAO.java
@@ -41,11 +41,11 @@
* @param questId
* 问卷ID
*/
- @Select("<script> " + "SELECT ac.* \n"
- + "FROM com_act_questnaire_answer_content ac left JOIN com_act_questnaire_sub qs ON ac.sub_id = qs.id \n"
- + " LEFT JOIN com_act_questnaire qn ON qs.que_Id = qn.id \n" + "WHERE qn.id=#{questId}\n"
- + "ORDER BY ac.user_id, qs.id " + "</script>")
- List<ComActQuestnaireAnswerContentDO> selectListByQuestnaire(@Param("questId") Long questId);
+// @Select("<script> " + "SELECT ac.* \n"
+// + "FROM com_act_questnaire_answer_content ac left JOIN com_act_questnaire_sub qs ON ac.sub_id = qs.id \n"
+// + " LEFT JOIN com_act_questnaire qn ON qs.que_Id = qn.id \n" + "WHERE qn.id=#{questId}\n"
+// + "ORDER BY ac.user_id, qs.id " + "</script>")
+ List<ComActQuestnaireAnswerContentVO> selectListByQuestnaire(@Param("questId") Long questId);
/**
* 查询问卷用户回答数据
--
Gitblit v1.7.1