From ae40432d02f5a698994c0b0847ef1b3f3f31451b Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期二, 08 十月 2024 17:13:27 +0800
Subject: [PATCH] Merge branch 'master-v3' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v3

---
 src/main/java/com/mzl/flower/dto/response/payment/OrderListDTO.java |    8 ++++++++
 1 files changed, 8 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 efc30df..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
@@ -85,4 +85,12 @@
 
     @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