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

xiangpei

2024-06-28 6043c55ce5a3c4f146e20286a707f67d09384674

 src/main/resources/mapper/QuestionMapper.xml

@@ -112,7 +112,7 @@
        FROM
             t_question tq
        WHERE
              tq.subject_id = #{subjectId}
              tq.subject_id = #{subjectId} AND tq.question_type = #{questionType} AND tq.deleted = 0
        ORDER BY
                 RAND()
        LIMIT #{num}