Merge remote-tracking branch 'origin/master'

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

@@ -46,12 +46,12 @@ public class CourseController extends BaseController {
     }
 
     @ApiOperation(value = "根据群编号，获取群组基本信息")
-    @GetMapping("/findGroupById")
-    public Object findGroupById(String groupId){
-        if(StringUtils.isEmpty(groupId)){
+    @GetMapping("/course/findGroupById")
+    public Object findGroupById(Integer groupId){
+        if(null == groupId){
             return failed("参数校验错误");
         }
-        return succeed(classGroupService.get(Integer.parseInt(groupId.substring(2))));
+        return succeed(classGroupService.get(groupId));
     }
 
     @ApiOperation(value = "分页获取学员购买记录")

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherManageController.java

@@ -5,7 +5,6 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.CashAccountDetail;
 import com.ym.mec.biz.dal.entity.SysSuggestion;
 import com.ym.mec.biz.dal.entity.SysUserBankCard;
-import com.ym.mec.biz.dal.page.queryMusicGroupStudentQueryInfo;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.UploadReturnBean;
@@ -68,6 +67,14 @@ public class TeacherManageController extends BaseController {
         return succeed();
     }
 
+    @ApiOperation(value = "根据群编号，获取群组基本信息")
+    @GetMapping("/course/findGroupById")
+    public Object findGroupById(Integer groupId){
+        if(null == groupId){
+            return failed("参数校验错误");
+        }
+        return succeed(classGroupService.get(groupId));
+    }
 
     @ApiOperation(value = "根据群编号，获取群组所有成员基本信息")
     @GetMapping("classGroup/findGroupUsers")