From 2a498d9f65f873cedb74ab5bcb48ad4b845d0622 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 30 八月 2023 10:01:04 +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 00c9f6f..c6d51ce 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
@@ -36,6 +36,8 @@
     private Double discountedPrice;
     @ApiModelProperty("恶劣天气费")
     private Double badWeatherPrice;
+    @ApiModelProperty("节假日费")
+    private Double holidayPrice;
     @ApiModelProperty("支付金额")
     private Double payMoney;
     @ApiModelProperty("微信收款码")

--
Gitblit v1.7.1