From 736ab0090700c75af37b8a3456b01609e4e2d329 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 17 七月 2024 11:09:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CancleOrder.java | 83 ++---------------------------------------
1 files changed, 5 insertions(+), 78 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CancleOrder.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CancleOrder.java
index d379e59..583a06e 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CancleOrder.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CancleOrder.java
@@ -4,10 +4,12 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
/**
* 取消订单设置
*/
+@Data
@TableName("t_sys_cancle_order")
public class CancleOrder {
/**
@@ -22,83 +24,8 @@
@TableField("companyId")
private Integer companyId;
/**
- * 时间（分钟）
+ * 取消规则
*/
- @TableField("minuteNum")
- private Integer minuteNum;
- /**
- * 金额
- */
- @TableField("money")
- private Double money;
- /**
- * 类型（1=取消，2=预约取消）
- */
- @TableField("type")
- private Integer type;
- /**
- * 订单类型（1=专车，2=出租车）
- */
- @TableField("orderType")
- private Integer orderType;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public Integer getMinuteNum() {
- return minuteNum;
- }
-
- public void setMinuteNum(Integer minuteNum) {
- this.minuteNum = minuteNum;
- }
-
- public Double getMoney() {
- return money;
- }
-
- public void setMoney(Double money) {
- this.money = money;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public Integer getOrderType() {
- return orderType;
- }
-
- public void setOrderType(Integer orderType) {
- this.orderType = orderType;
- }
-
- @Override
- public String toString() {
- return "CancleOrder{" +
- "id=" + id +
- ", companyId=" + companyId +
- ", minuteNum=" + minuteNum +
- ", money=" + money +
- ", type=" + type +
- ", orderType=" + orderType +
- '}';
- }
+ @TableField("content")
+ private String content;
}
--
Gitblit v1.7.1