fix

models/report.go

@@ -818,7 +818,7 @@ WHERE
 	a.publish_status = 1 
 	AND a.is_class = 1 
 	AND man_g.industrial_management_id = ?
-	UNION 
+	UNION ALL
 	SELECT
 	COUNT( 1 ) count 
 	FROM
@@ -848,7 +848,7 @@ func GetTimeLineReportIndustrialList(industrialManagementId, startSize, pageSize
 	* 
 FROM
 	(
-	SELECT
+		SELECT
 		a.article_id AS id,
 		a.title,
 		a.publish_date AS publish_time,
@@ -860,12 +860,12 @@ FROM
 	WHERE
 		a.publish_status = 1 
 		AND a.is_class = 1 
-		AND man_g.industrial_management_id = ? UNION
+		AND man_g.industrial_management_id = ? UNION ALL
 	SELECT
 		mmc.id,
 		'' AS title,
+		mm.publish_time AS publish_time,
 		'' AS video_url,
-		mm.publish_time,
 		mmc.content 
 	FROM
 		cygx_morning_meeting_review_chapter AS mmc