diff --git a/hs-im-server/im-service/src/main/java/com/lld/im/service/message/service/MessageSyncService.java b/hs-im-server/im-service/src/main/java/com/lld/im/service/message/service/MessageSyncService.java
index c0dde2a..ab47d4d 100644
--- a/hs-im-server/im-service/src/main/java/com/lld/im/service/message/service/MessageSyncService.java
+++ b/hs-im-server/im-service/src/main/java/com/lld/im/service/message/service/MessageSyncService.java
@@ -221,9 +221,9 @@ public class MessageSyncService {
                 .collect(Collectors.toMap(ImMessageHistoryEntity::getToId, x -> x));
         // 合并map到toId
         fromIdMap.forEach((key,value) -> {
-            toIdMap.merge(key,value,(x,y) -> {
-                if (value.getMessageKey() > y.getMessageKey()) return value;
-                return y;
+            toIdMap.merge(key,value,(v1,v2) -> {
+                if (v1.getMessageKey() > v2.getMessageKey()) return v1;
+                return v2;
             });
         });