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

xiangpei

2024-07-11 5073a245f53fd5ca936e779be8c6b9b19d42f67d

 src/main/resources/mapper/EducationResourceMapper.xml

@@ -32,6 +32,9 @@
            <if test="query.classId != null">
                AND ter.class_id = #{query.classId}
            </if>
            <if test="query.contentType != null and query.contentType != '' ">
                AND ter.content_type = #{query.contentType}
            </if>
        </where>
        ORDER BY
        ter.create_time DESC
@@ -65,6 +68,9 @@
            <if test="query.subjectId != null">
                AND ter.subject_id = #{query.subjectId}
            </if>
            <if test="query.contentType != null and query.contentType != '' ">
                AND ter.content_type = #{query.contentType}
            </if>
        </where>
        ORDER BY
        ter.create_time DESC