From 1af395ecb948a9d0af14aa72d7fc8025e849e6bc Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 22 一月 2026 19:20:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java
index 08b8266..c39dc11 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java
@@ -209,6 +209,14 @@
@ApiModelProperty(value = "杩旇繕鐢ㄦ埛绉垎", example = "1")
private BigDecimal returnMemberIntegral;
+ @ApiModelProperty(value = "閫�娆鹃噾棰�", example = "1")
+ private BigDecimal refundMoney;
+
+ @ApiModelProperty(value = "閫�娆炬椂闂�", example = "1")
+ private Date refundTime;
+
+ @ApiModelProperty(value = "閫�娆炬搷浣滀汉", example = "1")
+ private Integer refundUserId;
@ApiModelProperty(value = "鏂囦欢鍦板潃")
@TableField(exist = false)
@@ -225,6 +233,12 @@
@ApiModelProperty(value = "鏄电О")
@TableField(exist = false)
private String nickName;
+ @ApiModelProperty(value = "鐢ㄦ埛濮撳悕")
+ @TableField(exist = false)
+ private String memberName;
+ @ApiModelProperty(value = "鍙戣揣浜哄鍚�")
+ @TableField(exist = false)
+ private String kdUserName;
@ApiModelProperty(value = "鐢佃瘽")
@TableField(exist = false)
private String phone;
--
Gitblit v1.9.3