Merge branch 'cygx_11.0' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -2069,7 +2069,7 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 		}
 		//resp.List = append(resp.List, services.ActivityButtonShow(v))
 	}
-	resp.List = services.ActivityArrButtonShow(resp.List)
+	resp.List = services.ActivityArrButtonShow(activityList)
 
 	// 查研观向7.4-判断标签是否为产业, 为产业时是否跳转资源包
 	if label != "" {