Merge branch 'cygx_12.0' into debug

models/user.go

@@ -174,17 +174,17 @@ func GetArticleUserCollectList(startSize, pageSize, userId int) (items []*Articl
 			UNION ALL
 			SELECT
 		a.id AS article_id,
+		0 AS category_id,
 		a.title AS title,
 		date_format( a.publish_time, '%Y-%m-%d' ) AS publish_date,
 		b.nick_name AS nick_name,
-		0 AS category_id,
+		-1 AS article_type_id,
+		'' AS article_type_name,
+		1 AS is_special,
+		a.tags AS special_tags,
 		( SELECT count( 1 ) FROM cygx_yanxuan_special_record AS h WHERE h.yanxuan_special_id = a.id ) AS pv,
 		( SELECT count( 1 ) FROM cygx_yanxuan_special_collect AS ac  INNER JOIN wx_user as u ON  u.user_id = ac.user_id  WHERE ac.yanxuan_special_id = a.id  ) AS collect_num,
 		( SELECT count( 1 ) FROM cygx_yanxuan_special_collect AS ac WHERE ac.yanxuan_special_id = a.id  AND user_id = ? ) AS my_collect_num,
-		1 AS is_special,
-		a.tags AS special_tags,
-		-1 AS article_type_id,
-		'' AS article_type_name,
 		c.create_time AS create_time 
 	FROM
 	cygx_yanxuan_special AS a