From a76e2318dd2731ff713df6e262396a9175d029f7 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 13 二月 2026 09:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java |   11 +++++++++++
 1 files changed, 11 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 a21b33d..13a8ba5 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
@@ -218,6 +218,9 @@
     @ApiModelProperty(value = "閫�娆炬搷浣滀汉", example = "1")
     private Integer refundUserId;
 
+    @ApiModelProperty(value = "閫�娆惧娉�", example = "1")
+    private Integer refundInfo;
+
     @ApiModelProperty(value = "鏂囦欢鍦板潃")
     @TableField(exist = false)
     private String resourcePath;
@@ -254,6 +257,11 @@
     @ApiModelProperty(value = "澶村儚淇℃伅")
     @TableField(exist = false)
     private String imgurl;
+
+
+    @ApiModelProperty(value = "缁忛攢鍟嗙數璇�")
+    @TableField(exist = false)
+    private String shopPhone;
 
     @ApiModelProperty(value = "鏀惰揣鍦板潃")
     @TableField(exist = false)
@@ -304,5 +312,8 @@
     @ApiModelProperty(value = "缁忛攢鍟嗗悕绉� ")
     @TableField(exist = false)
     private String shopName;
+    @ApiModelProperty(value = "鏄惁闇�瑕佺粺璁� ")
+    @TableField(exist = false)
+    private Boolean needCount;
 
 }

--
Gitblit v1.9.3