From f4c8c73bc5181b6d3265c6a0ce19ae13c600baa3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 04 九月 2025 12:07:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
index e30593c..8b7add8 100644
--- a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
+++ b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
@@ -396,7 +396,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")
@@ -484,11 +484,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;
}
public Integer getIsplatPay() {
--
Gitblit v1.7.1