Merge branch 'refs/heads/feature-im-gitea'

handler/im.go

@@ -108,7 +108,6 @@ func GetFriendRequest(c *gin.Context) {
 	user_id := int(id.(float64))
 	data := service.GetFriendRequest(user_id)
 	c.JSON(http.StatusOK, gin.H{"code": proto.SuccessCode, "data": data, "message": "success"})
-
 }
 
 func CreateGroup(c *gin.Context) {

service/imService.go

@@ -124,7 +124,7 @@ func GetFriendList(user_id int) FGRet {
 	return fg
 }
 
-func GetFriendRequest(user_id int) []dao.User {
+func GetFriendRequest(user_id int) []dao.FriendRequest {
 	//获取好友请求
 	users := dao.GetFriendRequest(user_id)
 	return users