Merge remote-tracking branch 'origin/master'

mec-biz/src/main/resources/config/mybatis/ExtracurricularExercisesMapper.xml

@@ -25,13 +25,13 @@
 	<sql id="queryPageCondition">
 		<where>
 			<if test="teacherId != null">
-				teacher_id_ = #{teacherId}
+				and teacher_id_ = #{teacherId}
 			</if>
 			<if test="title != null">
-				title_ = #{title}
+				and title_ = #{title}
 			</if>
 			<if test="batchNo != null">
-				batch_no_ = #{batchNo}
+				and batch_no_ = #{batchNo}
 			</if>
 			<if test="assignStartTime != null">
 				AND ee.create_time_ &gt;= #{assignStartTime}