From f1ba329891967bca6d083a9d5722683a9fa2080b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 22 九月 2025 09:17:10 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/ZhaoYangChuXing
---
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java | 17 ++++++++++++++---
1 files changed, 14 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..0595060 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")
@@ -457,6 +457,17 @@
@ApiModelProperty(value = "支付流水号")
@TableField("transactionId")
private String transactionId;
+ @ApiModelProperty(value = "是否已确认 1=是 0=否")
+ @TableField("isConfirm")
+ private Integer isConfirm;
+
+ public Integer getIsConfirm() {
+ return isConfirm;
+ }
+
+ public void setIsConfirm(Integer isConfirm) {
+ this.isConfirm = isConfirm;
+ }
public String getTransactionId() {
return transactionId;
@@ -521,11 +532,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