Merge remote-tracking branch 'origin/master'

Administrator

2022-07-13 798ab07db6464f24e353dcdf8397506ab246c91d

 src/main/java/org/springblade/modules/exam/mapper/ExamPaperMapper.xml

@@ -607,6 +607,7 @@
                SELECT * FROM ( SELECT * FROM exam_subject_choices WHERE choices_type = 3 ORDER BY RAND( ) LIMIT 5 ) d
            ) esc
            LEFT JOIN exam_subject_option eso ON esc.id = eso.subject_choices_id
            order by esc.choices_type
    </select>