Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/report_selection.go

@@ -145,7 +145,7 @@ func (this *ReportSelectionController) Detail() {
 						listSonLog[k2].OverviewArticleId = 0
 					}
 					listSonLog[k2].List = listIndustrial
-					listSonLog[k2].IsShowApplyButton = true
+					//listSonLog[k2].IsShowApplyButton = true
 					if v2.Label != "" {
 						v2.CompanyLabel = strings.Split(v2.Label, "{|}")
 					}

services/task.go

@@ -40,12 +40,12 @@ func Task() {
 
 		yiDongSignAppointmentsForThird := task.NewTask("yiDongSignAppointmentsForThird", "0 */10 * * * *", YiDongSignAppointmentsForThird) //会前一小时将，报名信息同步到易董
 		task.AddTask("yiDongSignAppointmentsForThird", yiDongSignAppointmentsForThird)
-	}
-
-	if utils.IsTask {
 
 		getYiDongActivity := task.NewTask("getYiDongActivity", "0 */10 * * * *", GetYiDongActivity) //同步易董的活动信息
 		task.AddTask("getYiDongActivity", getYiDongActivity)
+	}
+
+	if utils.IsTask {
 
 		//会议提醒模板消息推送
 		sendActivityBeginMsg := task.NewTask("sendActivityBeginMsg", "0 */10 6-23 * * *", SendActivityBeginMsg) //会议前60分钟的提醒