Merge remote-tracking branch 'origin/master'

mec-web/src/main/java/com/ym/mec/web/controller/APIController.java

@@ -40,7 +40,7 @@ public class APIController extends BaseController {
 	public Integer queryTeacherOrganId(Integer userId) {
 		Teacher teacher = teacherDao.get(userId);
 		if (teacher != null) {
-			return teacher.getOrganId();
+			return teacher.getTeacherOrganId();
 		}
 		return null;
 	}