From db384fe8a0290b5831d1a2f8bcb6d3df2604ecf5 Mon Sep 17 00:00:00 2001
From: tanghc <thc8775@163.com>
Date: Thu, 17 Dec 2020 14:59:11 +0800
Subject: [PATCH] 4.2.4

---
 doc/docs/files/10087_自定义返回结果.md | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/doc/docs/files/10087_自定义返回结果.md b/doc/docs/files/10087_自定义返回结果.md
index 123cf503..8269c67e 100644
--- a/doc/docs/files/10087_自定义返回结果.md
+++ b/doc/docs/files/10087_自定义返回结果.md
@@ -109,17 +109,7 @@ public class SopGatewayApplication {
 
 ## 不合并结果
 
-如果不希望对结果进行合并，可设置`ApiConfig.getInstance().setMergeResult(false);`
+如果不希望对结果进行合并，可在application.properties中设置`sop.api-config.merge-result=false`
 
-```java
-public class SopGatewayApplication {
-    
-    public static void main(String[] args) {
-        ApiConfig.getInstance().setMergeResult(false);
-        SpringApplication.run(SopGatewayApplication.class, args);
-    }
-
-}
-```
 
 这样，网关最终返回结果即为微服务端的返回结果。
\ No newline at end of file