Merge branch 'reg_progress_20210318' into online1

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

@@ -77,6 +77,9 @@ public class MusicGroupRegisterController extends BaseController {
         if (hasReg != null && hasReg.getMusicGroupStatus() != StudentMusicGroupStatusEnum.QUIT) {
             return succeed(hasReg);
         }
+        if (hasReg != null && hasReg.getMusicGroupStatus() == StudentMusicGroupStatusEnum.QUIT) {
+            return failed( "无法重复报名，请联系教务老师");
+        }
         String err = studentRegistrationService.checkRegOrPayStatus(musicGroup.getId());
         if (err != null) {
             return failed(err + "不可报名，请联系教务老师");