From 6d2ec1b3b6979bce9c8f9244c8a17f5ccfa67063 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 26 十二月 2024 17:21:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/dto/response/payment/OrderListDTO.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/payment/OrderListDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/OrderListDTO.java
index 9647193..7ec12ed 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/OrderListDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/OrderListDTO.java
@@ -82,4 +82,18 @@
@ApiModelProperty(value = "快递单号")
private String deliveryNo;//快递单号
+
+ @ApiModelProperty(value = "支付单号")
+ private String paymentTrId;
+
+ @ApiModelProperty(value = "特殊需求")
+ @DictTrans(target = "specialNeedsStr", codeType = "SPEC_REQ")
+ private String specialNeeds;
+ private String specialNeedsStr;
+
+ @ApiModelProperty(value = "留言")
+ private String remarks;
+
+ @ApiModelProperty(value = "订单扎数")
+ private Integer saleNum;
}
--
Gitblit v1.9.3