From e73d51df2fc2fc369c02eff3571a76f75b98a8ba Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 01 十一月 2024 13:14:08 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4

---
 src/main/java/com/mzl/flower/dto/response/payment/OrderListDTO.java |   11 +++++++++++
 1 files changed, 11 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..0087f32 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,15 @@
 
     @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;
 }

--
Gitblit v1.9.3