From 2ba0e4c222d707b163d97afb122d3183c99dbf7a Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 02 十二月 2024 09:31:19 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v5
---
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