Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -2410,7 +2410,7 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 		item.Resource = 1
 		item.ActivityId = v.ActivityId
 		//if v.YidongActivityId > 0 {
-		//	item.IsExternalLabel = true
+		item.IsExternalLabel = v.IsExternalLabel
 		//}
 		mapActivity[v.ActivityTypeId] = append(mapActivity[v.ActivityTypeId], item)
 		mapkeyWord[fmt.Sprint(v.ActivityTypeId, "-", item.KeyWord)] = item.KeyWord