Merge branch 'release' into test

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java

@@ -995,9 +995,10 @@ public class OrderMergeServiceImpl implements OrderMergeService {
             deleteItem.addAll(value.stream().map(t->t.getId()).collect(Collectors.toList()));
         }
 
-        if(!orderItemInfoList.isEmpty()){
-            mergeOutItem.addAll(orderItemInfoList);
+        if(orderItemInfoList.isEmpty()){
+            R.error("当前勾选明细行未发现满足合并条件的数据");
         }
+        mergeOutItem.addAll(orderItemInfoList);
         log.debug("明细合并合并后{}", JSONObject.toJSONString(mergeOutItem));
 
         //对比合计税额的误差，此处将不参与和与参与合并合并对比