Merge branch 'cygx_13.8.1' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

models/article.go

@@ -259,7 +259,7 @@ type CygxArticleEs struct {
 // 获取文章列表
 func GetArticleList(condition string, pars []interface{}) (items []*ArticleDetail, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT	article_id FROM cygx_article  WHERE 1= 1 ` + condition
+	sql := `SELECT	article_id,stock FROM cygx_article  WHERE 1= 1 ` + condition
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }