Merge remote-tracking branch 'origin/master'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherFreeTimeServiceImpl.java

@@ -63,7 +63,7 @@ public class TeacherFreeTimeServiceImpl extends ServiceImpl<TeacherFreeTimeDao,
     public TeacherFreeTimeVo getDetail(PracticeTimesSetting practiceTimesSetting) {
         TeacherFreeTimeVo getDetail=baseMapper.getDetail(practiceTimesSetting);
         if (getDetail==null){
-            throw new BizException("陪练课设置不存在");
+            return getDetail;
         }
         List<TeacherSubjectPrice> priceList=baseMapper.getPrice(getDetail.getId());
         getDetail.setSubjectPrice(priceList);