From 729a5a0592cac7750e8b476c5fcb25bfc3ff8d25 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期日, 27 七月 2025 09:06:31 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CancleOrder.java | 195 ++++++++++++++++++++++++++----------------------
1 files changed, 104 insertions(+), 91 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CancleOrder.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CancleOrder.java
index d379e59..c11ae70 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CancleOrder.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CancleOrder.java
@@ -10,95 +10,108 @@
*/
@TableName("t_sys_cancle_order")
public class CancleOrder {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- @TableField("id")
- private Integer id;
- /**
- * 企业id
- */
- @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 +
- '}';
- }
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ @TableField("id")
+ private Integer id;
+ /**
+ * 企业id
+ */
+ @TableField("companyId")
+ private Integer companyId;
+ /**
+ * 开通城市id
+ */
+ @TableField("openCityId")
+ private Integer openCityId;
+ /**
+ * 时间（分钟）
+ */
+ @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 getOpenCityId() {
+ return openCityId;
+ }
+
+ public void setOpenCityId(Integer openCityId) {
+ this.openCityId = openCityId;
+ }
+
+ 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 +
+ '}';
+ }
}
--
Gitblit v1.7.1