Skip to content

M
mall.oytour.com
Commit ce6c6bcb authored by 吴春's avatar 吴春
Browse files
Options

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

parents 7edc1202 1af70e9b
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
Mall.WebApi/Controllers/Education/AppletPointController.cs
View file @ ce6c6bcb
...@@ -196,6 +196,7 @@ namespace Mall.WebApi.Controllers.Education ...@@ -196,6 +196,7 @@ namespace Mall.WebApi.Controllers.Education
StudyDateStr = x.StudyDate.ToString("yyyy-MM-dd HH:mm:ss"), StudyDateStr = x.StudyDate.ToString("yyyy-MM-dd HH:mm:ss"),
x.StudyDuration, x.StudyDuration,
x.TotalStudyDuration, x.TotalStudyDuration,
x.DurationUnit,
DurationUnit = x.DurationUnit.GetEnumName(), DurationUnit = x.DurationUnit.GetEnumName(),
x.OrderStaus, x.OrderStaus,
OrderStatusName = x.OrderStaus.GetEnumName(), OrderStatusName = x.OrderStaus.GetEnumName(),
...@@ -243,6 +244,7 @@ namespace Mall.WebApi.Controllers.Education ...@@ -243,6 +244,7 @@ namespace Mall.WebApi.Controllers.Education
StudyDateStr = model.StudyDate.ToString("yyyy-MM-dd HH:mm:ss"), StudyDateStr = model.StudyDate.ToString("yyyy-MM-dd HH:mm:ss"),
model.StudyDuration, model.StudyDuration,
model.TotalStudyDuration, model.TotalStudyDuration,
model.DurationUnit,
DurationUnit = model.DurationUnit.GetEnumName(), DurationUnit = model.DurationUnit.GetEnumName(),
model.OrderStaus, model.OrderStaus,
OrderStatusName = model.OrderStaus.GetEnumName(), OrderStatusName = model.OrderStaus.GetEnumName(),
......
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