From 8c469898c0a71224e17780696d47581de47c9ed7 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 23 十月 2024 11:23:36 +0800
Subject: [PATCH] fix: 冲突

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

diff --git a/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemStatisticsDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemStatisticsDTO.java
index dee44d7..fe9bc30 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemStatisticsDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemStatisticsDTO.java
@@ -24,5 +24,4 @@
     @ApiModelProperty(value = "价格")
     private BigDecimal price;
 
-    private String id;
 }

--
Gitblit v1.9.3