Commit d89253ee authored by 黄奎's avatar 黄奎

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

parents 8fb087b2 c539f4ee
......@@ -958,6 +958,8 @@ namespace Edu.WebApi.Controllers.Course
item.ClassName,
itemTime.StartTime,
itemTime.EndTime,
item.TeacherName,
item.UserIcon,
GuestStr = (item.GuestList != null && item.GuestList.Any()) ? string.Join(",", item.GuestList.Select(x => x.GuestName)) : ""
});
}
......@@ -983,7 +985,7 @@ namespace Edu.WebApi.Controllers.Course
}
result.Add(new
{
IsLessonStatus,
IsLessonStatus = (planList != null && planList.Any()) ? IsLessonStatus : -1,
DayTime,
DateYear = startTime.AddDays(i).ToString("yyyy"),
DateMonth = startTime.AddDays(i).ToString("MM"),
......
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