feature：批量明细合并

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

@@ -1941,7 +1941,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
             String entId = t.getString("entId");
             String ddh = t.getString("ddh");
             try {
-                R r = mergeOrderItem(orderInfoId, entId, null);
+                R r = mergeOrderItem(entId,orderInfoId, null);
                 if(!ConfigureConstant.STRING_0000.equals(r.getCode())){
                     return R.error(String.format("结算单号%s明细行合并失败",ddh));
                 }