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

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

@@ -224,7 +224,7 @@
                ch.completed_num_,
                ch.expect_num_,
                ch.expiry_date_,
-               ch.music_score_id_,
+               sch.music_score_id_,
                sms.name_ music_score_name_,
                sch.id_  studentCourseHomeworkId,
                sch.attachments_,
@@ -236,7 +236,7 @@
                  LEFT JOIN student_course_homework sch ON ch.id_ = sch.course_homework_id_
                  LEFT JOIN music_group mg ON ch.music_group_id_ = mg.id_
                  LEFT JOIN class_group cg ON ch.class_group_id_ = cg.id_
-                 LEFT JOIN sys_music_score sms ON ch.music_score_id_ = sms.id_
+                 LEFT JOIN sys_music_score sms ON sch.music_score_id_ = sms.id_
         WHERE ch.course_schedule_id_ = #{courseScheduleID}
           AND sch.user_id_ = #{userID}
     </select>