feature：明细合并存在单条无法参与合并数据的，比对数据问题

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

@@ -2063,7 +2063,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
             try {
                 R r = mergeOrderItem(entId,orderInfoId, null);
                 if(!ConfigureConstant.STRING_0000.equals(r.getCode())){
-                    return R.error(String.format("结算单号%s明细行合并失败",ddh));
+                    return r;
                 }
             } catch (Exception e) {
                 log.error("批量合并报错orderInfoId:{},entId:{},报错信息:{}",orderInfoId,entId,e);