|  | @@ -4018,7 +4018,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 | 
											
												
													
														|  |          //主班是否有报名状态的学员
 |  |          //主班是否有报名状态的学员
 | 
											
												
													
														|  |          StudentRegistration studentRegistration = studentRegistrationDao.findApplyStudent(musicGroup.getId(), studentIds);
 |  |          StudentRegistration studentRegistration = studentRegistrationDao.findApplyStudent(musicGroup.getId(), studentIds);
 | 
											
												
													
														|  |          if (studentRegistration != null) {
 |  |          if (studentRegistration != null) {
 | 
											
												
													
														|  | -            throw new BizException("操作失败: 学员 {}/{} 在 {} 中为报名状态不可合并,请将该学员退团处理后再次合并",
 |  | 
 | 
											
												
													
														|  | 
 |  | +            throw new BizException("操作失败: 学员 {}/{} 在 {} 中为报名状态不可合并",
 | 
											
												
													
														|  |                      studentRegistration.getName(),studentRegistration.getUserId(),musicGroup.getName());
 |  |                      studentRegistration.getName(),studentRegistration.getUserId(),musicGroup.getName());
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
												
													
														|  |          //获取缴费状态在审核中或者已拒绝的缴费项目的学员
 |  |          //获取缴费状态在审核中或者已拒绝的缴费项目的学员
 |