From cd16d710415a86e2012bdac8badafeda0bec0b61 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 09 五月 2024 16:57:09 +0800
Subject: [PATCH] 合并代码
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java
index 9c3c386..4fbb254 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java
@@ -404,6 +404,7 @@
@TableField("destination")
private String destination;
private Integer isplatPay;
+ @TableField(exist = false)
private BigDecimal freeMoney;
/**
* 补差价金额
@@ -415,4 +416,9 @@
*/
@TableField("startMileage")
private Double startMileage;
+ /**
+ * 中途取消（0=否，1=是）
+ */
+ @TableField("cancelMidway")
+ private Integer cancelMidway;
}
--
Gitblit v1.7.1