Merge remote-tracking branch 'origin/master'

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

@@ -129,8 +129,7 @@ public class ClassGroupController extends BaseController {
     @ApiOperation(value = "乐团所有班级列表")
     @GetMapping("/findAllClassGroupByMusicGroup")
     @PreAuthorize("@pcs.hasPermissions('classGroup/findAllClassGroupByMusicGroup')")
-    public HttpResponseResult findAllClassGroupByMusicGroup(@ApiParam(value = "乐团编号", required = true) @RequestParam String musicGroupId,
-                                                            @ApiParam(value = "班级类型", required = false) @RequestParam String type) {
+    public HttpResponseResult findAllClassGroupByMusicGroup(String musicGroupId,String type) {
         return succeed(classGroupService.findAllClassGroupByMusicGroup(musicGroupId,type));
     }