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/request/payment/OrderItemCheckCommitReduceDTO.java | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/request/payment/OrderItemCheckCommitReduceDTO.java b/src/main/java/com/mzl/flower/dto/request/payment/OrderItemCheckCommitReduceDTO.java
index 1299f40..daa6be5 100644
--- a/src/main/java/com/mzl/flower/dto/request/payment/OrderItemCheckCommitReduceDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/payment/OrderItemCheckCommitReduceDTO.java
@@ -9,9 +9,6 @@
@Data
public class OrderItemCheckCommitReduceDTO extends OrderItemCheckCommitDTO {
- @ApiModelProperty(value = "订单商品id")
- private List<String> pictureList;
-
@ApiModelProperty(value = "处理类型")
private String targetLevel;
--
Gitblit v1.9.3