Merge remote-tracking branch 'origin/master'

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

@@ -127,7 +127,7 @@ public class MusicGroupController extends BaseController {
             return failed("乐团还未开启缴费，请等待通知");
         }
         if(studentRegistration.getTemporaryCourseFee() == null &&
-                (!musicGroup.getStatus().equals(MusicGroupStatusEnum.APPLY) || !musicGroup.getStatus().equals(MusicGroupStatusEnum.PAY))){
+                (!musicGroup.getStatus().equals(MusicGroupStatusEnum.APPLY) && !musicGroup.getStatus().equals(MusicGroupStatusEnum.PAY))){
             return failed("乐团在"+musicGroup.getStatus().getMsg()+",不能缴费");
         }
         studentRegistration.setOwnershipType(musicGroup.getOwnershipType());