From 80d88f15a2222ec2dbe33f5d1d2b2296a890f41b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 03 三月 2026 16:22:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/MemberOrderResponse.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/MemberOrderResponse.java b/server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/MemberOrderResponse.java
index 6489992..930b012 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/MemberOrderResponse.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/MemberOrderResponse.java
@@ -33,9 +33,14 @@
     @ApiModelProperty(value = "鍊掕鏃�", example = "1")
     private Long countdown;
 
-    @ApiModelProperty(value = "鍙栨秷鏃堕棿", example = "1")
+    @ApiModelProperty(value = "璁㈠崟鍙栨秷鏃堕棿", example = "1")
     private Date cancelDate;
 
+
+    @ApiModelProperty(value = "鍙栨秷鏃堕棿(鑷姩鍙栨秷浣跨敤)", example = "1")
+    private Date cancelOptDate;
+
+
     @ApiModelProperty(value = "鍒涘缓鏃堕棿", example = "1")
     private Date createDate;
 

--
Gitblit v1.9.3