Merge branch 'online1'

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

@@ -2756,7 +2756,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                         if(onlineToOffline&&Objects.nonNull(vipGroupActivity)&&(vipGroupActivity.getAllowOnlineToOffline()==0||vipGroupActivity.getAllowOnlineToOffline()==3)){
                             throw new BizException("此VIP课活动不支持线上课调整为线下课");
                         }
-						if(offlineToOnline&&(vipGroupActivity.getAllowOnlineToOffline()==2||vipGroupActivity.getAllowOnlineToOffline()==3)){
+						if(offlineToOnline&&Objects.nonNull(vipGroupActivity)&&(vipGroupActivity.getAllowOnlineToOffline()==2||vipGroupActivity.getAllowOnlineToOffline()==3)){
 							throw new BizException("此VIP课活动不支持线下课调整为线上课");
 						}
 						if(onlineToOffline&&Objects.isNull(vipGroupCourseAdjustInfo.getSchoolId())){