Browse Source

Merge branch 'fee_audit' of http://git.dayaedu.com/yonge/mec

zouxuan 4 years ago
parent
commit
531178730a

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

@@ -1013,8 +1013,8 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 					e.printStackTrace();
 					e.printStackTrace();
 				}
 				}
 			}
 			}
-			calenderAuditDetailDto.setMusicGroupPaymentCalenderCourseSettings(courseSettings);
 		}
 		}
+		calenderAuditDetailDto.setMusicGroupPaymentCalenderCourseSettings(courseSettings);
 		//获取跨团合班学员缴费详情
 		//获取跨团合班学员缴费详情
 		calenderAuditDetailDto.setMusicGroupPaymentCalenderStudentDetails(musicGroupPaymentCalenderStudentDetailDao.findByBatchNo(batchNo));
 		calenderAuditDetailDto.setMusicGroupPaymentCalenderStudentDetails(musicGroupPaymentCalenderStudentDetailDao.findByBatchNo(batchNo));
 		return calenderAuditDetailDto;
 		return calenderAuditDetailDto;