From 511ce651667f5b2284247cc60599078b86f7963f Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 23 一月 2026 13:48:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 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..a21b33d 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,21 @@
@ApiModelProperty(value = "鏄电О")
@TableField(exist = false)
private String nickName;
+ @ApiModelProperty(value = "鐢ㄦ埛濮撳悕")
+ @TableField(exist = false)
+ private String memberName;
+ @ApiModelProperty(value = "浼樻儬鍒稿悕绉�")
+ @TableField(exist = false)
+ private String couponName;
+ @ApiModelProperty(value = "鍙栨秷浜哄憳濮撳悕")
+ @TableField(exist = false)
+ private String cancelUserName;
+ @ApiModelProperty(value = "閫�娆句汉濮撳悕")
+ @TableField(exist = false)
+ private String refundUserName;
+ @ApiModelProperty(value = "鍙戣揣浜哄鍚�")
+ @TableField(exist = false)
+ private String kdUserName;
@ApiModelProperty(value = "鐢佃瘽")
@TableField(exist = false)
private String phone;
@@ -235,8 +258,6 @@
@ApiModelProperty(value = "鏀惰揣鍦板潃")
@TableField(exist = false)
private String addr;
-
-
@ApiModelProperty(value = "寮�濮嬫椂闂� ")
@TableField(exist = false)
--
Gitblit v1.9.3