Merge branch 'dev' into test

@@ -521,6 +521,7 @@ type (
 		ArticleId   int64     `json:"articleId"`
 		ArticleId   int64     `json:"articleId"`
 		Title       string    `json:"title"`
 		Title       string    `json:"title"`
 		Author      string    `json:"author"` // 发布人
 		Author      string    `json:"author"` // 发布人
+		Avatar 	    string    `json:"avatar"`// 发布人的头像
 		Images      []string  `json:"images"`
 		Images      []string  `json:"images"`
 		CreatedAt   int64     `json:"createdAt"`
 		CreatedAt   int64     `json:"createdAt"`
 		MeReadFlag  int       `json:"meReadFlag"` //已读标识 [0:未读] [1:已读]
 		MeReadFlag  int       `json:"meReadFlag"` //已读标识 [0:未读] [1:已读]

@@ -61,15 +61,16 @@ func (l *MiniSearchArticlePageLogic) MiniSearchArticlePage(req *types.MiniSearch
 	}
 	}
 
 
 	for i, val := range articleList {
 	for i, val := range articleList {
-
 		item := types.MiniSearchArticleItem{
 		item := types.MiniSearchArticleItem{
 			ArticleId:  val.Id,
 			ArticleId:  val.Id,
 			Title:      val.Title,
 			Title:      val.Title,
 			Author:     val.Author.Name,
 			Author:     val.Author.Name,
+			Avatar:     val.Author.Avatar,
 			Images:     []string{},
 			Images:     []string{},
 			CreatedAt:  val.CreatedAt,
 			CreatedAt:  val.CreatedAt,
 			MeReadFlag: 0,
 			MeReadFlag: 0,
 		}
 		}
+
 		if _, ok := readFlag[val.Id]; ok {
 		if _, ok := readFlag[val.Id]; ok {
 			item.MeReadFlag = 1
 			item.MeReadFlag = 1
 		}
 		}

@@ -1217,6 +1217,7 @@ type MiniSearchArticleItem struct {
 	ArticleId  int64    `json:"articleId"`
 	ArticleId  int64    `json:"articleId"`
 	Title      string   `json:"title"`
 	Title      string   `json:"title"`
 	Author     string   `json:"author"` // 发布人
 	Author     string   `json:"author"` // 发布人
+	Avatar 	   string   `json:"avatar"`
 	Images     []string `json:"images"`
 	Images     []string `json:"images"`
 	CreatedAt  int64    `json:"createdAt"`
 	CreatedAt  int64    `json:"createdAt"`
 	MeReadFlag int      `json:"meReadFlag"` //已读标识 [0:未读] [1:已读]
 	MeReadFlag int      `json:"meReadFlag"` //已读标识 [0:未读] [1:已读]