Commit 839d3edd authored by liudong1993's avatar liudong1993

Merge branch 'sdzq' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq-ld

parents c8a3bbd8 ff5a0957
......@@ -83,7 +83,7 @@ namespace Mall.Model.Extend.Education
get
{
int status = 0;//未开始
DateTime currentDay = Convert.ToDateTime(Common.ConvertHelper.FormatDate(DateTime.Now));
DateTime currentDay = Convert.ToDateTime(Common.ConvertHelper.FormatTime(DateTime.Now));
if (currentDay >= this.StartTime && currentDay <= this.EndTime)
{
status = 1;//进行中
......@@ -106,7 +106,7 @@ namespace Mall.Model.Extend.Education
int isSign = 0;
if (this.SignStartTime != null && this.SignEndTime != null)
{
DateTime currentDay = Convert.ToDateTime(Common.ConvertHelper.FormatDate(DateTime.Now));
DateTime currentDay = Convert.ToDateTime(Common.ConvertHelper.FormatTime(DateTime.Now));
if (currentDay >= this.SignStartTime && currentDay <= this.SignEndTime)
{
isSign = 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