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

services/resource_data.go

@@ -476,6 +476,12 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 				continue
 			}
 			if v.SourceId == vList.SourceId && v.Source == vList.Source {
+				if v.Activityvideo != nil {
+					v.SourceId = v.Activityvideo.SourceId
+				}
+				if v.Activityvoice != nil {
+					v.SourceId = v.Activityvoice.SourceId
+				}
 				items = append(items, v)
 			}
 		}