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/flower/FlowerCartListWrapDTO.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/flower/FlowerCartListWrapDTO.java b/src/main/java/com/mzl/flower/dto/response/flower/FlowerCartListWrapDTO.java
index fe52698..e14e221 100644
--- a/src/main/java/com/mzl/flower/dto/response/flower/FlowerCartListWrapDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/flower/FlowerCartListWrapDTO.java
@@ -14,7 +14,7 @@
@ApiModelProperty(value = "供应商名称")
private String supplierName;
- @ApiModelProperty(value = "供应商名称")
+ @ApiModelProperty(value = "商品列表")
private List<FlowerCartListDTO> flowerList;
}
--
Gitblit v1.9.3