From 9cf6d184a1b8a3a2a951a6842a586906747d46cd Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 05 八月 2025 20:56:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 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 2127df5..4e46bf9 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
@@ -444,7 +444,43 @@
@ApiModelProperty(value = "修改价格审核 1=待审核 2=通过")
@TableField("priceAuditState")
private Integer priceAuditState;
+ /**
+ * 预付金额
+ */
+ @TableField("paymentAdvanceMoney")
+ private Double paymentAdvanceMoney;
+ /**
+ * 支付方式（0：预付1：后付）
+ */
+ @TableField("payMethod")
+ private Integer payMethod;
+ @ApiModelProperty(value = "支付流水号")
+ @TableField("transactionId")
+ private String transactionId;
+ public String getTransactionId() {
+ return transactionId;
+ }
+
+ public void setTransactionId(String transactionId) {
+ this.transactionId = transactionId;
+ }
+
+ public Integer getPayMethod() {
+ return payMethod;
+ }
+
+ public void setPayMethod(Integer payMethod) {
+ this.payMethod = payMethod;
+ }
+
+ public Double getPaymentAdvanceMoney() {
+ return paymentAdvanceMoney;
+ }
+
+ public void setPaymentAdvanceMoney(Double paymentAdvanceMoney) {
+ this.paymentAdvanceMoney = paymentAdvanceMoney;
+ }
public Integer getPriceAuditState() {
return priceAuditState;
}
--
Gitblit v1.7.1