From d7819bb819cd897d5933ac98bdec7e3ccc70846c Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 23 十月 2024 10:55:24 +0800
Subject: [PATCH] fix: 冲突

---
 src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemDTO.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemDTO.java
index f8d9395..7108efe 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemDTO.java
@@ -44,4 +44,5 @@
     @ApiModelProperty(value = "商品参数")
     private List<ParamItemDTO> params;
 
+    private Integer num;
 }

--
Gitblit v1.9.3