From e0ea1f4a21321f145be79556896181f23f22b708 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期四, 29 八月 2024 09:33:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-v2
---
src/main/java/com/mzl/flower/dto/request/payment/OrderItemSalesQueryDTO.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 4b402bc..4d23a14 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
@@ -11,6 +11,9 @@
@ApiModelProperty(value = "订单id")
private String orderId;
+ @ApiModelProperty(value = "订单商品id")
+ private String orderItemId;
+
@ApiModelProperty(value = "商品名称")
private String flowerName;
@@ -29,16 +32,16 @@
@ApiModelProperty(value = "供应商名称")
private String supplierName;
- @ApiModelProperty(value = "下单开始时间; yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "下单开始时间; yyyy-MM-dd")
private String orderStartDateStr;
- @ApiModelProperty(value = "下单结束时间; yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "下单结束时间; yyyy-MM-dd")
private String orderEndDateStr;
- @ApiModelProperty(value = "售后开始时间; yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "售后开始时间; yyyy-MM-dd")
private String salesStartDateStr;
- @ApiModelProperty(value = "售后结束时间; yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "售后结束时间; yyyy-MM-dd")
private String salesEndDateStr;
@ApiModelProperty(value = "状态 ORDER_SALES_STATUS")
--
Gitblit v1.9.3