From 51eac60f5d04af43f93590ad2219f9bdda313745 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 25 十二月 2024 11:11:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/dto/request/payment/OrderItemSalesQueryDTO.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/request/payment/OrderItemSalesQueryDTO.java b/src/main/java/com/mzl/flower/dto/request/payment/OrderItemSalesQueryDTO.java
index 0296019..d69bd85 100644
--- a/src/main/java/com/mzl/flower/dto/request/payment/OrderItemSalesQueryDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/payment/OrderItemSalesQueryDTO.java
@@ -5,11 +5,15 @@
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.List;
@Data
public class OrderItemSalesQueryDTO implements Serializable {
@ApiModelProperty(value = "订单id")
private String orderId;
+
+ @ApiModelProperty(value = "订单商品id")
+ private String orderItemId;
@ApiModelProperty(value = "商品名称")
private String flowerName;
@@ -64,4 +68,8 @@
@ApiModelProperty(hidden = true)
private LocalDateTime salesEndDate;
+
+ private String salesType;//售后类型
+
+ private List<String> statusList;
}
--
Gitblit v1.9.3