Merge branch 'dev_v2.2.0' into release_v2.2.0

teachcloud-common/src/main/resources/mapper/BasicCourseMapper.xml

@@ -80,7 +80,6 @@
                 AND org.type = 'TEACHING_ROOM'
                 AND org.enable = TRUE
         <where>
-            AND bc.enable = TRUE
             <if test="courseName != null and courseName.length > 0">
                 AND bc.name LIKE CONCAT('%',#{courseName},'%')
             </if>