Merge branch 'CRM6.0' into debug

controllers/roadshow/calendar.go

@@ -130,6 +130,7 @@ func (this *CalendarController) Accept() {
 
 	updateParams["status"] = 2
 	updateParams["modify_time"] = time.Now()
+	updateParams["approve_time"] = time.Now()
 
 	err = roadshow.UpdateCalendarResearcher(whereParams, updateParams)
 	if err != nil {