From 04aa86aaad90ac02a4d167129ab3e530e9a9589c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 19 一月 2026 10:22:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsorderDetail.java | 2 ++
1 files changed, 2 insertions(+), 0 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..d1db85a 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,6 +98,8 @@
@ApiModelProperty(value = "绉垎鎶垫墸閲戦", example = "1")
private BigDecimal integralDeduct;
+ @ApiModelProperty(value = "缁忛攢鍟嗙粨绠楅噾棰�", example = "1")
+ private BigDecimal shopSettlement;
--
Gitblit v1.9.3