Merge branch 'test' into 'master'

罗元桥

2021-08-31 a68d05e7a5c610881418a670f7a4d3fe34103892

Merge branch 'test' into 'master'

bug修复

See merge request root/zhihuishequ!149

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

@@ -58,7 +58,7 @@
            car.content as reserveSubContent, carac.answer_content as answerContent,carac.reserve_sub_id as reserveSubId
        FROM
            com_act_reserve_answer_content AS carac
            LEFT JOIN com_act_reserve_sub AS car ON car.reserve_id = carac.reserve_record_id
            LEFT JOIN com_act_reserve_sub AS car ON car.id = carac.reserve_sub_id
        where carac.reserve_record_id = #{reserveRecordId} order by carac.id asc
    </select>