From 80fd41ea0dc602ac3ca33778f17fce5bc2e817b1 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 16 一月 2026 18:58:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/MemberOrderResponse.java | 9 ++++++++-
1 files changed, 8 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 efb7ddb..a076e15 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
@@ -1,5 +1,6 @@
package com.doumee.dao.web.response.goods;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberCoupon;
import com.doumee.dao.business.model.Shop;
import io.swagger.annotations.ApiModel;
@@ -22,6 +23,9 @@
@ApiModelProperty(value = "璁㈠崟涓婚敭", example = "1")
private Integer orderId;
+
+ @ApiModelProperty(value = "鐢ㄦ埛涓婚敭", example = "1")
+ private Integer memberId;
@ApiModelProperty(value = "鍊掕鏃�", example = "1")
private Long countdown;
@@ -69,7 +73,7 @@
private String linkAddress;
@ApiModelProperty(value = "璁㈠崟澶囨敞", example = "1")
- private String memberInfo;
+ private String remark;
@ApiModelProperty(value = "璁㈠崟鍙�", example = "1")
private String code;
@@ -103,6 +107,9 @@
@ApiModelProperty(value = "缁忛攢鍟嗕俊鎭�", example = "1")
private Shop shopInfo;
+ @ApiModelProperty(value = "鐢ㄦ埛淇℃伅", example = "1")
+ private Member member;
+
@ApiModelProperty(value = "浼樻儬鍒镐俊鎭�", example = "1")
private MemberCoupon memberCoupon;
--
Gitblit v1.9.3