Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/schedule/controller/ScheduleController.java

@@ -253,7 +253,7 @@ public class ScheduleController {
 
             String courseName = courseTable.getCourseName();
 
-            ClassTime classTime = classTimeList.stream().filter(u->u.getNumber().equals(courseTable.getTimePeriod())).findAny().orElse(null);
+            ClassTime classTime = classTimeList.stream().filter(u->u.getNumber().equals(courseTable.getTimeNumber())).findAny().orElse(null);
 
             if(classTime!=null){
                 courseName +="("+classTime.getShortName()+")";