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
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysCancleOrder.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysCancleOrder.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysCancleOrder.java
index ddf12d4..fbd260f 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysCancleOrder.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysCancleOrder.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
import java.io.Serializable;
/**
@@ -16,6 +18,7 @@
* @since 2020-06-09
*/
@TableName("t_sys_cancle_order")
+@Data
public class TSysCancleOrder extends Model<TSysCancleOrder> {
private static final long serialVersionUID = 1L;
@@ -38,6 +41,22 @@
*/
private BigDecimal money;
/**
+ *预定费用
+ */
+ private BigDecimal reserveMoney;
+ /**
+ *取消里程费
+ */
+ private Integer km;
+ /**
+ * 司机超时xx分钟 未到达指定地点 用户取消订单 不收取费用
+ */
+ private Integer overtime;
+ /**
+ * 取消时长费
+ */
+ private Integer kmMinute;
+ /**
* 1=普通单取消，2=预约单取消
*/
private Integer type;
--
Gitblit v1.7.1