Merge branch 'cygx_10.9' into debug

models/report.go

@@ -1215,10 +1215,9 @@ FROM
 		cam.industrial_management_id = ? AND cam.source = 1  UNION ALL
  	SELECT 
 		ca.activity_id AS id,
-		0 as  article_id,
 		cavo.voice_name AS title,
-		'' AS video_url,
 		ca.activity_time AS publish_time,
+		'' AS video_url,
 		cavo.voice_url AS voice_url,
 		'' AS sub_category_name,
 		'' AS content,
@@ -1234,7 +1233,7 @@ FROM
 `
 	sql += ` ORDER BY 
 	t.publish_time DESC LIMIT ?,? `
-	_, err = o.Raw(sql, industrialManagementId, industrialManagementId, industrialManagementId, industrialManagementId, startSize, pageSize).QueryRows(&items)
+	_, err = o.Raw(sql, industrialManagementId, industrialManagementId, industrialManagementId, industrialManagementId, industrialManagementId, startSize, pageSize).QueryRows(&items)
 	return
 }