From 1c44f37505032b89326924ceddc749991be4097f Mon Sep 17 00:00:00 2001
From: gaorl <gaoronglin@ele-cloud.com>
Date: Fri, 30 Jun 2023 14:24:51 +0800
Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/order/service/impl/OrderMergeServiceImpl.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java
index c87c3f96..e38a9f0a 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java
@@ -996,7 +996,7 @@ public class OrderMergeServiceImpl implements OrderMergeService {
         }
 
         if(orderItemInfoList.isEmpty()){
-            R.error("当前勾选明细行未发现满足合并条件的数据");
+            return R.error("当前勾选明细行未发现满足合并条件的数据");
         }
         mergeOutItem.addAll(orderItemInfoList);
         log.debug("明细合并合并后{}", JSONObject.toJSONString(mergeOutItem));