Merge remote-tracking branch 'origin/master'

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

@@ -102,7 +102,7 @@
 	</select>
 
 	<select id="queryByUserIdList" resultMap="TeacherDefaultPracticeGroupSalary">
-		SELECT * FROM teacher_default_practice_group_salary where ser_id_ IN
+		SELECT * FROM teacher_default_practice_group_salary where user_id_ IN
 		<foreach collection="userIdList" item="userId" open="(" close=")" separator=",">
 			#{userId}
 		</foreach>