From d2c5f419fa584cd1061b13d47f4963d7a2ef3e3a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 29 八月 2025 10:45:11 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/ZhaoYangChuXing into dev
---
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
index 4e46bf9..339a911 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
@@ -434,7 +434,7 @@
private Integer priceType;
@ApiModelProperty(value = "预估价")
@TableField("estimatedPrice")
- private BigDecimal estimatedPrice;
+ private Double estimatedPrice;
@ApiModelProperty(value = "上一次定位推送时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -521,11 +521,11 @@
this.priceType = priceType;
}
- public BigDecimal getEstimatedPrice() {
+ public Double getEstimatedPrice() {
return estimatedPrice;
}
- public void setEstimatedPrice(BigDecimal estimatedPrice) {
+ public void setEstimatedPrice(Double estimatedPrice) {
this.estimatedPrice = estimatedPrice;
}
--
Gitblit v1.7.1