From 96abc87da07408ef817d9086ea71ba4c287aa474 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 09 十二月 2024 11:52:07 +0800
Subject: [PATCH] Merge branch 'master-v5' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v5

---
 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