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

services/resource_data.go

@@ -394,8 +394,10 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 		for _, item := range list {
 			if item.Type == 1 {
 				mapItems[fmt.Sprint("activityvoice", item.Id)].Activityvoice = item
+				item.SourceId = item.ActivityId
 			} else if item.Type == 2 {
 				mapItems[fmt.Sprint("activityvideo", item.Id)].Activityvideo = item
+				item.SourceId = item.ActivityId
 			} else if item.Type == 3 {
 				mapItems[fmt.Sprint("roadshow", item.Id)].Roadshow = item
 			} else if item.Type == 4 {