Skip to content

M
mall.oytour.com
Commit 839d3edd authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents c8a3bbd8 ff5a0957
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
Mall.Model/Extend/Education/RB_Education_Activity_Extend.cs
View file @ 839d3edd
...@@ -83,7 +83,7 @@ namespace Mall.Model.Extend.Education ...@@ -83,7 +83,7 @@ namespace Mall.Model.Extend.Education
get get
{ {
int status = 0;//未开始 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) if (currentDay >= this.StartTime && currentDay <= this.EndTime)
{ {
status = 1;//进行中 status = 1;//进行中
...@@ -106,7 +106,7 @@ namespace Mall.Model.Extend.Education ...@@ -106,7 +106,7 @@ namespace Mall.Model.Extend.Education
int isSign = 0; int isSign = 0;
if (this.SignStartTime != null && this.SignEndTime != null) 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) if (currentDay >= this.SignStartTime && currentDay <= this.SignEndTime)
{ {
isSign = 1;//可报名 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