Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -41,7 +41,7 @@ public class MusicGroupRegisterController extends BaseController {
         }
         StudentRegistration hasReg = studentRegistrationService.getByPhoneAndMusicGroupId(studentRegistration.getMusicGroupId(), studentRegistration.getParentsPhone());
         if (hasReg != null) {
-            return failed("该乐团您已注册");
+            return failed("该乐团您已报名");
         }
         if (musicGroup.getApplyExpireDate().compareTo(date) <= 0) {
             return failed("乐团已截止报名");