From bd491c37218b0b3d9b518e4814967d814e781c02 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 19 一月 2026 18:07:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 3472592..45d26bc 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
@@ -72,7 +72,6 @@
@ApiModelProperty(value = "閭垂閲戦", example = "1")
private BigDecimal mailPrice;
-
@ApiModelProperty(value = "璁㈠崟鐘舵��")
@ExcelColumn(name="璁㈠崟鐘舵��",index =10,width = 10)
@TableField(exist = false)
@@ -198,12 +197,18 @@
@ApiModelProperty(value = "鍒嗛攢鍟嗛摵涓婚敭 shop锛歩d", example = "1")
private Integer distributionShopId;
-
@ApiModelProperty(value = "鏍搁攢鐮�", example = "1")
private String exchangeCode;
@ApiModelProperty(value = "缁忛攢鍟嗙粨绠楅噾棰�", example = "1")
private BigDecimal shopSettlement;
+
+ @ApiModelProperty(value = "杩旇繕缁忛攢鍟嗙Н鍒�", example = "1")
+ private BigDecimal returnCustomerIntegral;
+
+ @ApiModelProperty(value = "杩旇繕鐢ㄦ埛绉垎", example = "1")
+ private BigDecimal returnMemberIntegral;
+
@ApiModelProperty(value = "鏂囦欢鍦板潃")
@TableField(exist = false)
@@ -216,7 +221,6 @@
@ApiModelProperty(value = "璁″垝璁㈠崟")
@TableField(exist = false)
private PlanorderDetail planorderDetail;
-
@ApiModelProperty(value = "鏄电О")
@TableField(exist = false)
--
Gitblit v1.9.3