Commit 9d2a514f authored by liudong1993's avatar liudong1993

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

parents 952e5425 0dd67d0d
...@@ -129,6 +129,6 @@ namespace Edu.Model.Entity.Course ...@@ -129,6 +129,6 @@ namespace Edu.Model.Entity.Course
/// <summary> /// <summary>
/// 课时 /// 课时
/// </summary> /// </summary>
public int ClassHours { get; set; } public decimal ClassHours { get; set; }
} }
} }
\ No newline at end of file
...@@ -261,7 +261,7 @@ namespace Edu.WebApi.Controllers.Course ...@@ -261,7 +261,7 @@ namespace Edu.WebApi.Controllers.Course
RenewSlPrice=base.ParmJObj.GetDecimal("RenewSlPrice"), RenewSlPrice=base.ParmJObj.GetDecimal("RenewSlPrice"),
Saleplat=base.ParmJObj.GetStringValue("Saleplat"), Saleplat=base.ParmJObj.GetStringValue("Saleplat"),
IsKCourse=base.ParmJObj.GetInt("IsKCourse"), IsKCourse=base.ParmJObj.GetInt("IsKCourse"),
ClassHours=base.ParmJObj.GetInt("ClassHours") ClassHours=base.ParmJObj.GetDecimal("ClassHours")
}; };
extModel.CreateTime = DateTime.Now; extModel.CreateTime = DateTime.Now;
extModel.CreateBy = base.UserInfo.Id; extModel.CreateBy = base.UserInfo.Id;
......
...@@ -392,7 +392,7 @@ namespace Edu.WebApi.Controllers.StudyAbroad ...@@ -392,7 +392,7 @@ namespace Edu.WebApi.Controllers.StudyAbroad
ManagerName = UserReidsCache.GetUserLoginInfo(extModel.ManagerId)?.AccountName ?? "", ManagerName = UserReidsCache.GetUserLoginInfo(extModel.ManagerId)?.AccountName ?? "",
extModel.PreferentialList, extModel.PreferentialList,
}; };
return ApiResult.Success(data: extModel); return ApiResult.Success(data: obj);
} }
/// <summary> /// <summary>
......
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