From 19fa90abbc2043b73bef3992428d912d011fc8c5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 30 八月 2023 09:59:49 +0800
Subject: [PATCH] 合并代码

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

diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceInfoWarpper.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceInfoWarpper.java
index 065520b..1f4e777 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceInfoWarpper.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceInfoWarpper.java
@@ -35,6 +35,10 @@
     private Double discountedPrice;
     @ApiModelProperty("恶劣天气费")
     private Double badWeatherPrice;
+    @ApiModelProperty("节假日费")
+    private Double holidayPrice;
+    @ApiModelProperty("订单金额")
+    private Double orderMoney;
     @ApiModelProperty("支付金额")
     private Double payMoney;
 }

--
Gitblit v1.7.1