From ae917e09a897843344424ca7d36dd22c216f5f50 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 19 一月 2026 18:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsorderDetail.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsorderDetail.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsorderDetail.java
index 3e449da..b9769aa 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsorderDetail.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsorderDetail.java
@@ -98,8 +98,8 @@
@ApiModelProperty(value = "绉垎鎶垫墸閲戦", example = "1")
private BigDecimal integralDeduct;
-
-
+ @ApiModelProperty(value = "缁忛攢鍟嗙粨绠楅噾棰�", example = "1")
+ private BigDecimal shopSettlement;
@ApiModelProperty(value = "鍟嗗搧鏍囩鍚嶇О")
@@ -119,5 +119,8 @@
@ApiModelProperty(value = "鐖剁被鍚嶇О")
@TableField(exist = false)
private String parentName;
+ @ApiModelProperty(value = "缁熻閲�")
+ @TableField(exist = false)
+ private BigDecimal totalNum;
}
--
Gitblit v1.9.3