Merge branch 'apply_multi_order'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -1872,7 +1872,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
 
         StudentMusicGroupStatusEnum currentStudentMusicGroupStatus = studentRegistration.getMusicGroupStatus();
-        if (currentStudentMusicGroupStatus != StudentMusicGroupStatusEnum.NORMAL || currentStudentMusicGroupStatus != StudentMusicGroupStatusEnum.APPLY) {
+        if (currentStudentMusicGroupStatus != StudentMusicGroupStatusEnum.NORMAL && currentStudentMusicGroupStatus != StudentMusicGroupStatusEnum.APPLY) {
         	throw new BizException("用户当前在团状态不能退团");
         }
 
@@ -2113,7 +2113,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
 
         StudentMusicGroupStatusEnum currentStudentMusicGroupStatus = studentRegistration.getMusicGroupStatus();
-        if (currentStudentMusicGroupStatus != StudentMusicGroupStatusEnum.NORMAL || currentStudentMusicGroupStatus != StudentMusicGroupStatusEnum.APPLY) {
+        if (currentStudentMusicGroupStatus != StudentMusicGroupStatusEnum.NORMAL && currentStudentMusicGroupStatus != StudentMusicGroupStatusEnum.APPLY) {
         	throw new BizException("用户当前在团状态不能退团");
         }