From 3b8100c9b5e00e627b33c25f80fedac98e00b7dd Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 19 一月 2026 16:22:04 +0800
Subject: [PATCH] 小程序   接口开发

---
 server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java |   12 ++++--------
 1 files changed, 4 insertions(+), 8 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 0d60570..3472592 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
@@ -102,8 +102,6 @@
     @ApiModelProperty(value = "澶囨敞")
     private String remark;
 
-    @ApiModelProperty(value = "浣欓浣跨敤鏁伴噺", example = "1")
-    private BigDecimal integral;
 
     @ApiModelProperty(value = "鍞悗宸查��娆鹃噾棰�", example = "1")
     private BigDecimal aftersaleMoney;
@@ -184,11 +182,10 @@
 
 
     @ApiModelProperty(value = "绉垎鎶垫墸閲戦", example = "1")
-    private BigDecimal integralPrice;
+    private BigDecimal integral;
 
     @ApiModelProperty(value = "娑堣�楃Н鍒嗗��", example = "1")
     private BigDecimal useIntegral;
-
 
     @ApiModelProperty(value = "鍜栧暋璁″垝璁㈠崟褰㈠紡 0鏂板 1寤堕暱", example = "1")
     private Integer planOrderType;
@@ -204,6 +201,9 @@
 
     @ApiModelProperty(value = "鏍搁攢鐮�", example = "1")
     private String exchangeCode;
+
+    @ApiModelProperty(value = "缁忛攢鍟嗙粨绠楅噾棰�", example = "1")
+    private BigDecimal shopSettlement;
 
     @ApiModelProperty(value = "鏂囦欢鍦板潃")
     @TableField(exist = false)
@@ -265,9 +265,5 @@
     @ApiModelProperty(value = "鏃ユ湡 ")
     @TableField(exist = false)
     private String everyDay;
-
-    @ApiModelProperty(value = "璁㈠崟缁撶畻閲戦")
-    @TableField(exist = false)
-    private BigDecimal shopSettlement;
 
 }

--
Gitblit v1.9.3