feature：批量合并明细

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

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