Merge branch 'cygx_10.7' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

models/activity.go

@@ -178,6 +178,7 @@ type ActivityListResp struct {
 	ActivityName            string                     `description:"活动名称"`
 	OnlineParticipation     string                     `description:"网络参会"`
 	ReportLink              string                     `description:"报告链接"`
+	LinkParticipants        string                     `description:"链接参会"`
 	City                    string                     `description:"城市"`
 	Address                 string                     `description:"活动地址"`
 	Highlights              string                     `description:"活动亮点"`

services/activity.go

@@ -765,6 +765,7 @@ func ActivityButtonShow(item *models.ActivityDetail, user *models.WxUserItem, pe
 		IsCanOutboundCall:       v.IsCanOutboundCall,
 		TencentConferenceNumber: v.TencentConferenceNumber,
 		IsResearchSpecial:       v.IsResearchSpecial,
+		LinkParticipants:        v.LinkParticipants,
 		IsResearchPoints:        v.IsResearchPoints,
 		IsExternalLabel:         v.IsExternalLabel,
 	}
@@ -1034,6 +1035,10 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 				havePower = false
 			}
 		}
+<<<<<<< HEAD
+=======
+		//如果主客观校验不通过，那么直接返回
+>>>>>>> 45e382030b9631148fdf6168e44f34cc327279d3
 		if !havePower {
 			return
 		}