Merge remote-tracking branch 'origin/master'

linwei

2024-01-17 f5539e2f8e35d7e53abf54409245c5c7f9d2a72a

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

@@ -77,7 +77,10 @@
            <if test="subjectChoices.modifyDate != null ">and modify_date = #{subjectChoices.modifyDate}</if>
            <if test="subjectChoices.delFlag != null ">and del_flag = #{subjectChoices.delFlag}</if>
            <if test="subjectChoices.level != null ">and level = #{subjectChoices.level}</if>

        </where>
        order by level desc

    </select>