diff --git a/CHANGELOG.md b/CHANGELOG.md
index 110a8dea5..52c95c45e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,9 +3,11 @@
 
 -------------------------------------------------------------------------------------------------------------
 
-# 5.7.8 (2021-08-02)
+# 5.7.8 (2021-08-06)
 
 ### 🐣新特性
+* 【core   】     MapProxy支持return this的setter方法（pr#392@Gitee）
+
 ### 🐞Bug修复
 
 -------------------------------------------------------------------------------------------------------------
diff --git a/hutool-core/src/main/java/cn/hutool/core/map/MapProxy.java b/hutool-core/src/main/java/cn/hutool/core/map/MapProxy.java
index 0a59c1a79..7d3dd3e0f 100644
--- a/hutool-core/src/main/java/cn/hutool/core/map/MapProxy.java
+++ b/hutool-core/src/main/java/cn/hutool/core/map/MapProxy.java
@@ -155,7 +155,10 @@ public class MapProxy implements Map<Object, Object>, OptNullBasicTypeFromObject
 				final String fieldName = StrUtil.removePreAndLowerFirst(methodName, 3);
 				if (StrUtil.isNotBlank(fieldName)) {
 					this.put(fieldName, args[0]);
-					return proxy;
+					final Class<?> returnType = method.getReturnType();
+					if(returnType.isInstance(proxy)){
+						return proxy;
+					}
 				}
 			} else if ("equals".equals(methodName)) {
 				return this.equals(args[0]);