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 | 10 +++++++++-
1 files changed, 9 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 fe9aef2..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,8 +33,13 @@
@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;
@@ -122,6 +127,9 @@
@ApiModelProperty(value = "鏀粯鍗曞彿", example = "1")
private String payOrderId;
+ @ApiModelProperty(value = "鏀粯鏂瑰紡 0寰俊鏀粯 1绾夸笅鏀粯", example = "1")
+ private Integer payMethod;
+
@ApiModelProperty(value = "蹇�掑崟鍙�", example = "1")
private String kdCode;
--
Gitblit v1.9.3