From a5c2c7e633e0dba4b80c8a15fd34c38ae097befc Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 21 六月 2024 10:03:06 +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 | 101 ++++----------------------------------------------
1 files changed, 8 insertions(+), 93 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 fbd260f..9e7a3c5 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
@@ -1,5 +1,6 @@
package com.stylefeng.guns.modular.system.model;
+import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.enums.IdType;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotations.TableId;
@@ -24,110 +25,24 @@
private static final long serialVersionUID = 1L;
/**
- * 主键id
+ * 主键
*/
@TableId(value = "id", type = IdType.AUTO)
+ @TableField("id")
private Integer id;
/**
* 企业id
*/
+ @TableField("companyId")
private Integer companyId;
/**
- * 时间(分钟)
+ * 取消规则
*/
- private Integer minuteNum;
- /**
- * 金额
- */
- private BigDecimal money;
- /**
- *预定费用
- */
- private BigDecimal reserveMoney;
- /**
- *取消里程费
- */
- private Integer km;
- /**
- * 司机超时xx分钟 未到达指定地点 用户取消订单 不收取费用
- */
- private Integer overtime;
- /**
- * 取消时长费
- */
- private Integer kmMinute;
- /**
- * 1=普通单取消，2=预约单取消
- */
- private Integer type;
- /**
- * 1=专车，2=出租车,3=跨城出行
- */
- 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 BigDecimal getMoney() {
- return money;
- }
-
- public void setMoney(BigDecimal 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;
- }
+ @TableField("content")
+ private String content;
@Override
protected Serializable pkVal() {
- return this.id;
- }
-
- @Override
- public String toString() {
- return "TSysCancleOrder{" +
- "id=" + id +
- ", companyId=" + companyId +
- ", minuteNum=" + minuteNum +
- ", money=" + money +
- ", type=" + type +
- ", orderType=" + orderType +
- "}";
+ return null;
}
}
--
Gitblit v1.7.1