From 25a25f620b016505a629b9c7565ea1c01864adab Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 04 九月 2025 18:35:15 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/parkBike into 2.0.1

---
 server/services/src/main/java/com/doumee/dao/business/vo/GoodsorderTotalDataVO.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/dao/business/vo/GoodsorderTotalDataVO.java b/server/services/src/main/java/com/doumee/dao/business/vo/GoodsorderTotalDataVO.java
index e432c59..8f8cf97 100644
--- a/server/services/src/main/java/com/doumee/dao/business/vo/GoodsorderTotalDataVO.java
+++ b/server/services/src/main/java/com/doumee/dao/business/vo/GoodsorderTotalDataVO.java
@@ -19,8 +19,12 @@
 
     @ApiModelProperty(value = "鏀粯鎶奸噾",example = "0")
     private BigDecimal payMoney;
+    @ApiModelProperty(value = "濂楅鍗℃敹鍏�",example = "0")
+    private BigDecimal discountMoney;
     @ApiModelProperty(value = "鏀粯浜ゆ槗绗旀暟",example = "0")
     private int payNum;
+    @ApiModelProperty(value = "濂楅鍗′氦鏄撶瑪鏁�",example = "0")
+    private int discountNum;
 
     @ApiModelProperty(value = "閫�娆�",example = "0")
     private BigDecimal refundMoney;

--
Gitblit v1.9.3