Merge branch 'release' into test

2 years ago · bbfbd5d7bd
parent d352d8d300 1c44f37505
commit bbfbd5d7bd
1 changed files with 1 additions and 1 deletions
--- 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));