From 9c19d5222d91bb191808d868aa056bfedbacb0c9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 03 六月 2023 02:07:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Order.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Order.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Order.java
index 0294c69..56f7a1c 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Order.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Order.java
@@ -218,6 +218,11 @@
@TableField("estimatedMileage")
private Double estimatedMileage;
/**
+ * 预估时间
+ */
+ @TableField("estimatedTime")
+ private Integer estimatedTime;
+ /**
* 订单金额
*/
@TableField("orderMoney")
@@ -253,7 +258,7 @@
@TableField("discount")
private Double discount;
/**
- * 支付类型（1=微信支付，2=余额支付,3=线下支付）
+ * 支付类型（1=微信支付，2=余额支付,3=线下支付,4=微信+余额）
*/
@TableField("payType")
private Integer payType;
@@ -263,6 +268,11 @@
@TableField("payTime")
private Date payTime;
/**
+ * 账户余额支付金额
+ */
+ @TableField("balancePayment")
+ private Double balancePayment;
+ /**
* 第三方支付流水号
*/
@TableField("orderNo")
--
Gitblit v1.7.1