Merge branch 'online1'

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

@@ -67,7 +67,7 @@ public class MusicGroupRegisterController extends BaseController {
 
         StudentRegistration hasReg = studentRegistrationService.getByPhoneAndMusicGroupId(studentRegistration.getMusicGroupId(), studentRegistration.getParentsPhone());
         if (hasReg != null && hasReg.getMusicGroupStatus() != StudentMusicGroupStatusEnum.QUIT && MusicGroupStatusEnum.PAY.equals(musicGroup.getStatus())) {
-            return failed(HttpStatus.CONTINUE,"该乐团您已报名");
+            return succeed(hasReg);
         }
 
         if (musicGroup.getStatus().equals(MusicGroupStatusEnum.PAY)) {