Merge remote-tracking branch 'origin/master'

web/src/main/java/com/jpsoft/education/modules/base/controller/TclassController.java

@@ -350,6 +350,12 @@ public class TclassController {
                     tclass.setCourseTeachersN(employee.getEmployeeName());
                 }
 
+                CourseBase courseBase = courseBaseService.get(tclass.getCourseId());
+
+                if(courseBase!=null){
+                    tclass.setCourseName(courseBase.getCourseName());
+                }
+
                 dto.setTclass(tclass);
 
                 List<BuyLog> buyLogList = buyLogService.findByStatusAndClassId("1",tclass.getClassId());