From e73d51df2fc2fc369c02eff3571a76f75b98a8ba Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 01 十一月 2024 13:14:08 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4
---
src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementListDTO.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementListDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementListDTO.java
index bbd8d32..57870c7 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementListDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/OrderSettlementListDTO.java
@@ -37,9 +37,15 @@
@ApiModelProperty(value = "交易合计")
private BigDecimal totalAmount;
- @ApiModelProperty(value = "质检扣款")
+ @ApiModelProperty(value = "降级扣款")
private BigDecimal checkFee;
+ @ApiModelProperty(value = "缺货扣款")
+ private BigDecimal lackFee;
+
+ @ApiModelProperty(value = "补货扣款")
+ private BigDecimal replaceFee;
+
@ApiModelProperty(value = "集货站运费")
private BigDecimal stationFee;
--
Gitblit v1.9.3