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

 Conflicts:

	mec-student/src/main/java/com/ym/mec/student/controller/StudentManageController.java

mec-student/src/main/java/com/ym/mec/student/controller/StudentManageController.java

@@ -1,6 +1,5 @@
 package com.ym.mec.student.controller;
 
-import com.ym.mec.biz.dal.entity.Student;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.entity.HttpResponseResult;
 import io.swagger.annotations.*;
@@ -100,8 +99,7 @@ public class StudentManageController extends BaseController {
         if (user == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        Student student = studentService.get(user.getId());
-        return succeed(student);
+        return succeed(studentService.get(user.getId()));
     }
 
     @ApiOperation(value = "根据群编号，获取群组所有成员基本信息")