Merge remote-tracking branch 'origin/test' into test

101captain

2021-10-14 3ac9df9e72f1406cbfbd4c86b4d39d12f11b0701

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActQuestnaireDOMapper.xml

@@ -59,8 +59,8 @@
    </select>

    <delete id="deleteQuesSubAll">
        delete from com_act_questnaire_sub where que_Id = #{queId};
        delete from com_act_questnaire_sub_selection where que_Id = #{queId};
        delete from com_act_questnaire_sub where que_id = #{queId};
        delete from com_act_questnaire_sub_selection where que_id = #{queId};
    </delete>

    <select id="getQuesDetailAdmin" resultType="com.panzhihua.common.model.vos.community.questnaire.QuestnaireDetailAdminVO">
@@ -138,7 +138,7 @@
            com_act_questnaire_sub_selection AS caqss
            LEFT JOIN com_act_questnaire_sub AS caqs ON caqs.id = caqss.que_sub_id
        WHERE
            caqss.que_Id = #{summaryDTO.questId}
            caqss.que_id = #{summaryDTO.questId}
        order by caqss.create_at asc
    </select>

@@ -159,7 +159,7 @@
            com_act_questnaire_sub_selection AS caqss
            LEFT JOIN com_act_questnaire_sub AS caqs ON caqs.id = caqss.que_sub_id
        WHERE
            caqss.que_Id = #{questId}
            caqss.que_id = #{questId}
        order by caqss.create_at asc
    </select>