Merge remote-tracking branch 'origin/master'

edu-user/edu-user-biz/src/main/resources/config/mybatis/ExamRoomMapper.xml

@@ -359,6 +359,9 @@
 			<if test="openFlag != null and openFlag == 0">
 				AND er.open_flag_ = #{openFlag}
 			</if>
+			<if test="search != null and search != ''">
+				AND eb.name_ LIKE CONCAT('%',#{search},'%')
+			</if>
 		</where>
 	</sql>
 	<select id="countExamRoomPage" resultType="java.lang.Integer">