From f9b9131367d9ba6fe852130b12083c0f5ea68bbb Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期一, 27 五月 2024 17:26:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 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