Merge remote-tracking branch 'origin/master'

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

@@ -181,7 +181,7 @@
 	</select>
     <select id="findStudentCourseNum" resultType="java.util.Map">
 		SELECT COUNT(DISTINCT cssp.id_) 'value',cssp.music_group_id_ 'key' FROM course_schedule cs
-		LEFT JOIN course_schedule_student_payment cssp ON cs.music_group_id_ = cssp.music_group_id_
+		LEFT JOIN course_schedule_student_payment cssp ON cs.music_group_id_ = cssp.music_group_id_ AND cs.id_ = cssp.course_schedule_id_
 		WHERE cs.music_group_id_ IN
 		<foreach collection="musicGroupIds" separator="," item="item" open="(" close=")">
 			#{item}

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

@@ -51,7 +51,7 @@
 
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="Teacher">
-        SELECT t.id_,t.organ_id_ teacher_organ_id_,t.job_type_,t.is_probation_period_,t.education_background_,t.graduate_school_,t.graduate_school_,
+        SELECT t.id_,t.organ_id_ teacher_organ_id_,t.job_type_,t.job_nature_,t.is_probation_period_,t.education_background_,t.graduate_school_,t.graduate_school_,
         t.technical_titles_,t.work_unit_,t.subject_id_,t.entry_date_,t.certificate_type_,t.certificate_num_,t.flow_organ_range_,t.update_time_,
         t.create_time_,t.introduction_,t.demission_date_,t.is_support_course_schedule_rewards_rules_,
         su.real_name_,su.password_,su.salt_,su.phone_,su.avatar_,