From 7454b6532cd2a5c68235a45f1cc540e25f1ffaf4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 07 四月 2023 18:40:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderPriceWarpper.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderPriceWarpper.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderPriceWarpper.java
index b0638b5..fd05f84 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderPriceWarpper.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderPriceWarpper.java
@@ -52,6 +52,8 @@
     private Double overBadWeatherPrice;
     @ApiModelProperty("折扣金额")
     private Double discountAmount;
+    @ApiModelProperty("优惠金额")
+    private Double discountedPrice;
     @ApiModelProperty("微信收款码")
     private String wxCollectionCode;
     @ApiModelProperty("支付宝收款码")

--
Gitblit v1.7.1