feature：订单明细合并

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

@@ -1858,7 +1858,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         if(ObjectUtil.isNull(orderItemInfos)){
             return R.error("税收编码为空的不允许合并，请先更新税收编码");
         }
-        Map<String, List<OrderItemInfo>> collect1 = collect.stream().collect(Collectors.groupingBy(t -> t.getFphxz() + t.getXmmc() + t.getGgxh() + t.getSl() + t.getSpbm()));
+        Map<String, List<OrderItemInfo>> collect1 = collect.stream().collect(Collectors.groupingBy(t -> t.getFphxz() + t.getXmmc() + t.getXmdw() + t.getGgxh() + t.getSl() + t.getSpbm()));
         List<OrderItemInfo> orderItemInfoList = new ArrayList<>();
         List<String> deleteItem = new ArrayList<>();
         for (List<OrderItemInfo> value : collect1.values()) {