Merge remote-tracking branch 'origin/master'

lin

2024-03-14 c4e2c196aad8af656d94bc47e9f1a80bc504b5d7

 src/main/java/org/springblade/modules/subjectChoices/mapper/SubjectChoicesMapper.xml

@@ -30,9 +30,13 @@
    </resultMap>

    <select id="selectCircleCommentByParentId" parameterType="long"
            resultType="org.springblade.modules.subjectOption.entity.SubjectOptionEntity">
       select * from jczz_subject_option where
        subject_choices_id = #{id}
            resultType="org.springblade.modules.subjectOption.vo.SubjectOptionVO">
        SELECT
        jso.*
        FROM
        jczz_subject_option jso
        WHERE
        jso.subject_choices_id = #{id}
    </select>