Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleRewardsRulesDao.java

@@ -76,5 +76,5 @@ public interface CourseScheduleRewardsRulesDao extends BaseDAO<Integer, CourseSc
 	 * @param activeIds
 	 * @return
 	 */
-	List<CourseScheduleRewardsRules> findByIds(List<Integer> activeIds);
+	List<CourseScheduleRewardsRules> findByIds(@Param("activeIds")List<Integer> activeIds);
 }

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

@@ -145,8 +145,8 @@
         <include refid="findStudentsByOrganIdSql"/>
     </select>
     <select id="findStudentBaseInfoByUserID" resultMap="studentManageListDto">
-        SELECT su.username_,su.gender_,su.birthdate_,sr.parents_name_ real_name_,su.id_ user_id_,
-        sr.parents_phone_,sr.current_class_,sr.current_grade_,su.nation_
+        SELECT su.username_,su.gender_,su.birthdate_,su.real_name_,su.id_ user_id_,
+        su.phone_ parents_phone_,sr.current_class_,sr.current_grade_,su.nation_
         FROM sys_user su
         LEFT JOIN student_registration sr ON su.id_ = sr.user_id_
         WHERE su.id_ =#{userId} AND su.user_type_ = 'STUDENT' LIMIT 1