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

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

@@ -481,5 +481,5 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      * @param organId
      * @return
      */
-    List<TeacherBasicDto> findByFlowOrganRangeTeachers(String organId);
+    List<TeacherBasicDto> findByFlowOrganRangeTeachers(@Param("organId") String organId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/TeacherService.java

@@ -85,7 +85,7 @@ public interface TeacherService extends BaseService<Integer, Teacher> {
      * @param organId
      * @return
      */
-    List<TeacherBasicDto> findTeachers(@Param("organId") String organId);
+    List<TeacherBasicDto> findTeachers(String organId);
 
     /**
      * @describe 根据科目获取部门下的教师
@@ -94,7 +94,7 @@ public interface TeacherService extends BaseService<Integer, Teacher> {
      * @param subjectId: 科目编号
      * @return java.util.List<com.ym.mec.biz.dal.entity.Teacher>
      */
-    List<Teacher> findOrganTeacherBySubject(@Param("subjectId") Integer subjectId);
+    List<Teacher> findOrganTeacherBySubject(Integer subjectId);
 
     /**
      * 获取教师上课结算列表