Merge branch 'cygx_12.0' into debug

models/cygx_yanxuan_special_user.go

@@ -105,7 +105,7 @@ func GetYanxuanSpecialAuthorList() (items []*CygxYanxuanSpecialAuthorItem, err e
 FROM
 	cygx_yanxuan_special_author as a
 	INNER JOIN wx_user AS u ON u.user_id = a.user_id
-	INNER JOIN company AS c ON c.company_id = u.company_id ORDER BY create_time DESC `
+	INNER JOIN company AS c ON c.company_id = u.company_id WHERE a.nick_name <> '' ORDER BY create_time DESC `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }