Merge branch 'aj_qa_avatar' into debug

logic/yb_community_question/yb_community_question_comment.go

@@ -267,6 +267,7 @@ func List(userId uint64, communityQuestionID int, hotFlag bool, page, pageSize i
 			UserImgUrl:                 utils.DEFAULT_HONGZE_USER_LOGO,
 			CreateTime:                 v.CreateTime,
 			ReplyList:                  nil,
+			QaAvatarUrl:                v.QaAvatarUrl,
 		}
 		if info, ok := usersMap[v.UserID]; ok && v.IsShowName == 1 {
 			tmp.UserName = info.NickName
@@ -390,6 +391,7 @@ func HandleCommentByCommunityQuestionItemList(userId uint64, questionList []*res
 		//最近一条 精选/我的 评论
 		if ybCommunityQuestionCommentInfo, ok := ybCommunityQuestionCommentMap[uint32(v.CommunityQuestionID)]; ok {
 			v.Comment = ybCommunityQuestionCommentInfo.Content
+			v.QaAvatarUrl = ybCommunityQuestionCommentInfo.QaAvatarUrl
 			v.CommentUserName = "匿名用户" + strconv.Itoa(int(3333+ybCommunityQuestionCommentInfo.UserID))
 			if info, ok := usersMap[ybCommunityQuestionCommentInfo.UserID]; ok && ybCommunityQuestionCommentInfo.IsShowName == 1 {
 				v.CommentUserName = info.NickName

models/response/community.go

@@ -29,6 +29,7 @@ type CommunityQuestionItem struct {
 	CommentTotal    int                           `json:"comment_total" description:"总共评论数"`
 	Comment         string                        `json:"comment" description:"评论"`
 	CommentUserName string                        `json:"comment_user_name" description:"评论人"`
+	QaAvatarUrl     string                        `description:"用户头像" json:"qa_avatar_url"`
 }
 
 type CommunityQuestionAudioItem struct {
@@ -111,6 +112,7 @@ type RespCommunityQuestionCommentItem struct {
 	UserName                   string    `description:"用户昵称" json:"user_name"`
 	UserImgUrl                 string    `description:"用户头像" json:"user_img_url"`
 	CreateTime                 time.Time `description:"留言创建时间" json:"create_time"`
+	QaAvatarUrl                string    `description:"用户头像" json:"qa_avatar_url"`
 	ReplyList                  []*ReplyItem
 }