Merge branch 'cygx_9.8' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

services/activity.go

@@ -1777,6 +1777,11 @@ func ActivityButtonShow(item *models.ActivityDetail) (articleDetail *models.Acti
 	if articleDetail.SourceType != 2 {
 		articleDetail.SourceType = 1
 	}
+	//如果是易董创建的活动，展示我要报名，不展示预约外呼
+	if articleDetail.IsYidongConduct {
+		articleDetail.IsShowSignup = true
+		articleDetail.IsShowOutboundCall = false
+	}
 	activityTimeText := articleDetail.ActivityTimeText
 	activityTimeText = strings.Replace(activityTimeText, "（", "(", -1)
 	activityTimeText = strings.Replace(activityTimeText, "）", ")", -1)