Commit 0498b46b authored by 黄奎's avatar 黄奎

Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

parents 97e33677 be1472b6
...@@ -4885,6 +4885,7 @@ namespace Edu.Module.Course ...@@ -4885,6 +4885,7 @@ namespace Edu.Module.Course
item.Key.CourseName, item.Key.CourseName,
ClassRoomId = item.Key.RoomId, ClassRoomId = item.Key.RoomId,
item.Key.RoomName, item.Key.RoomName,
item.Key.TeacherId,
item.Key.TeacherName, item.Key.TeacherName,
Ranks = item.Key.CourseGradeNo, Ranks = item.Key.CourseGradeNo,
CourseGradeIdName = item.Key.CourseGradeId.ToName(), CourseGradeIdName = item.Key.CourseGradeId.ToName(),
......
...@@ -3390,7 +3390,7 @@ namespace Edu.Module.Course ...@@ -3390,7 +3390,7 @@ namespace Edu.Module.Course
string ClassDate = ""; string ClassDate = "";
if (AppointModel != null) if (AppointModel != null)
{ {
ClassDate = AppointModel.Date.ToString("yyyy-MM-dd HH:mm"); ClassDate = AppointModel.Date.ToString("yyyy-MM-dd");
//正常约课 //正常约课
if (AppointModel.AppointType == 1) if (AppointModel.AppointType == 1)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment