Merge branch 'cygx/cygx_12.4' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

services/cygx/activity_ocr.go

@@ -244,7 +244,7 @@ func UpdateActivityVideoAndVoice(activityInfo *cygx.ActivityDetail, itemVoice *c
 			err = errors.New("GetActivityVideoCount" + e.Error())
 			return
 		}
-		activityId := itemVoice.ActivityId
+		activityId := itemVideo.ActivityId
 		//获取活动详情
 		activityInfo, e := cygx.GetAddActivityInfoById(activityId)
 		if e != nil {