Merge remote-tracking branch 'origin/master'

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

@@ -45,7 +45,7 @@
 				AND title_ like '%' #{title} '%'
 			</if>
 			<if test="status != null">
-				AND status_ = #{status}
+				AND eer.status_ = #{status}
 			</if>
 			<if test="isReplied != null">
 				AND is_replied_ = #{isReplied}