Merge branch 'cygx_10.9' into debug

# Conflicts:
#	models/report.go

models/report.go

@@ -663,7 +663,7 @@ FROM
 		AND p.visible_range = 1 
 		AND pm.industrial_management_id = ? UNION ALL
  	SELECT 
-		ca.activity_id AS id,
+		cav.video_id AS id,
 		0 as  article_id,
 		cav.video_name AS title,
 		ca.activity_time AS publish_time,