From 4d3316b87d18d37ce982928052fd5451f63cea92 Mon Sep 17 00:00:00 2001
From: imuxi <33019873+imuxi@users.noreply.github.com>
Date: Thu, 7 May 2020 11:10:30 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81support=20for=20merger=20when=20use?=
 =?UTF-8?q?=20@Reference=20or=20@Method=20or=20@DubboReference=20(#6092)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2、Delete unnecessary 'return' comments, Cause the check to failed
---
 .../org/apache/dubbo/config/annotation/DubboReference.java | 7 +++++--
 .../java/org/apache/dubbo/config/annotation/Method.java    | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/DubboReference.java b/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/DubboReference.java
index 985a4d992aa..eb1a2e6ead2 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/DubboReference.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/DubboReference.java
@@ -262,10 +262,13 @@
      */
     String tag() default "";
 
+    /**
+     * Service merger
+     */
+    String merger() default "";
+
     /**
      * methods support
-     *
-     * @return
      */
     Method[] methods() default {};
 
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/Method.java b/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/Method.java
index 0cdc97cf814..c1fe08885c1 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/Method.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/config/annotation/Method.java
@@ -65,5 +65,7 @@
 
     String validation() default "";
 
+    String merger() default "";
+
     Argument[] arguments() default {};
 }