diff --git a/src/services/message/handler.go b/src/services/message/handler.go
index 2556fa3..4f5ab38 100644
--- a/src/services/message/handler.go
+++ b/src/services/message/handler.go
@@ -100,9 +100,11 @@ func (c MessageServiceImpl) Chat(ctx context.Context, request *chat.ChatRequest)
 	//这个地方应该取出多少条消息？
 	//TO DO 看怎么需要一下
 
-	var rMessageList []*chat.Message
-	result := database.Client.WithContext(ctx).Where("conversation_id=?", conversationId).
-		Order("created_at desc").Find(&rMessageList)
+	var pMessageList []models.Message
+	result := database.Client.WithContext(ctx).
+		Where("conversation_id=?", conversationId).
+		Order("created_at desc").
+		Find(&pMessageList)
 
 	if result.Error != nil {
 		logger.WithFields(logrus.Fields{
@@ -120,6 +122,17 @@ func (c MessageServiceImpl) Chat(ctx context.Context, request *chat.ChatRequest)
 		return
 	}
 
+	rMessageList := make([]*chat.Message, 0, len(pMessageList))
+	for _, pMessage := range pMessageList {
+		rMessageList = append(rMessageList, &chat.Message{
+			Id:         pMessage.ID,
+			Content:    pMessage.Content,
+			CreateTime: uint32(pMessage.CreatedAt.Unix()),
+			FromUserId: &pMessage.FromUserId,
+			ToUserId:   &pMessage.ToUserId,
+		})
+	}
+
 	resp = &chat.ChatResponse{
 		StatusCode:  strings.ServiceOKCode,
 		StatusMsg:   strings.ServiceOK,