Merge remote-tracking branch 'origin/saas' into saas

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

@@ -557,7 +557,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 				throw new BizException("创建失败，已经存在缴费信息");
 			}
 		}
-		if(musicGroup.getStatus() == MusicGroupStatusEnum.PROGRESS){
+		if(musicGroup.getStatus() == MusicGroupStatusEnum.PRE_BUILD_FEE){
 			musicGroupPaymentBaseCalender.setPaymentType(MUSIC_APPLY);
 		}else {
 			if(musicGroupPaymentBaseCalender.getMusicGroupOrganizationCourseSettingId() != null){