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

models/report.go

@@ -632,11 +632,10 @@ func GetArticleAndYxSpecialList(condition, conditionSpecial string, userId int)
 			( SELECT count( 1 ) FROM cygx_yanxuan_special_collect AS ac WHERE ac.yanxuan_special_id = a.id AND user_id = ? ) AS my_collect_num,
 			a.type AS special_type,
 			a.user_id AS user_id,
-			c.create_time AS create_time 
+			a.create_time AS create_time 
 		FROM
 			cygx_yanxuan_special AS a
 			JOIN cygx_yanxuan_special_author AS b ON a.user_id = b.user_id
-			JOIN cygx_yanxuan_special_collect AS c ON a.id = c.yanxuan_special_id 
 		WHERE
 			1 = 1 
 			AND a.STATUS = 3 ` + conditionSpecial + ` ORDER BY publish_date DESC  LIMIT 30`