From 0982a97b0c65e11034b9d6b00cc0e4aba39254be Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 26 一月 2026 11:07:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java | 20 ++++++++++++++++++--
1 files changed, 18 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 1b52f41..df488df 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
@@ -233,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;
@@ -243,8 +258,6 @@
@ApiModelProperty(value = "鏀惰揣鍦板潃")
@TableField(exist = false)
private String addr;
-
-
@ApiModelProperty(value = "寮�濮嬫椂闂� ")
@TableField(exist = false)
@@ -291,5 +304,8 @@
@ApiModelProperty(value = "缁忛攢鍟嗗悕绉� ")
@TableField(exist = false)
private String shopName;
+ @ApiModelProperty(value = "鏄惁闇�瑕佺粺璁� ")
+ @TableField(exist = false)
+ private Boolean needCount;
}
--
Gitblit v1.9.3