From 709a4a10be56952ead6340e4822fce41a66e47cd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 26 七月 2023 18:39:28 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDriving into dev
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceWarpper.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceWarpper.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceWarpper.java
index cb335b2..7242969 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceWarpper.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceWarpper.java
@@ -34,11 +34,11 @@
@ApiModelProperty("超过长途里程费")
private Double overLongDistancePrice;
@ApiModelProperty("等待时长")
- private Integer waitTime;
+ private Double waitTime;
@ApiModelProperty("等待费")
private Double waitTimePrice;
@ApiModelProperty("超出等待时长")
- private Integer outWaitTime;
+ private Double outWaitTime;
@ApiModelProperty("超出等待费")
private Double outWaitTimePrice;
@ApiModelProperty("恶劣天气里程")
--
Gitblit v1.7.1