Merge branch 'zouxuan_saas_2022_04_15' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -100,7 +100,7 @@
     <select id="getMaxId" resultType="java.lang.Integer">
 		SELECT MAX(id_) FROM student_basic_info
 	</select>
-	<select id="updateSubjectTeacher">
+	<select id="updateSubjectTeacher" resultType="int">
 		SELECT updateSubjectTeacher()
 	</select>
 </mapper>