Merge branch 'cygx/cygx_need_p2_800' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

# Conflicts:
#	controllers/cygx/activity.go

controllers/cygx/activity.go

@@ -1249,6 +1249,8 @@ func (this *ActivityCoAntroller) PublishAndCancel() {
 		go cygxService.YiDongUpdateActivityPublish(activityId)
 	}
 	go cygxService.YanXuanActivityPointsBillActivityPublishAndCancel(activityId, AdminUser.AdminId, item.PublishStatus) //活动发布以及取消发布处理研选扣点
+
+	go elastic.AddComprehensiveActivity(activityId) // 同步Es添加活动
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "操作成功"