Merge branch 'test_bak' into 'test'

罗元桥

2021-09-17 1700d3ad8eee7a6d9e4063340870210b84b97546

Merge branch 'test_bak' into 'test'

lyq-修改调查问卷导出问题

See merge request root/zhihuishequ!181

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

@@ -42,7 +42,7 @@
        WHERE
            caq.id = #{questId}
        ORDER BY
            caqac.id ASC
            caqac.answer_id asc,caqac.id ASC
    </select>

</mapper>

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

@@ -34,7 +34,7 @@
            LEFT JOIN com_act_reserve_record carr ON carr.id = ac.reserve_record_id
        WHERE
            qn.id = #{reserveId}
            order by ac.id asc
            order by ac.reserve_record_id asc,ac.id asc
    </select>

    <select id="pageRegisterDetailedListAdmin" parameterType="com.panzhihua.common.model.dtos.community.reserve.PageReserveRegisterDetailedAdminDTO"