From 6408a348e14193b0f625673d4e4b22b9fbd1e369 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 08 八月 2025 18:10:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java b/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java
index 868cb51..71a0d7e 100644
--- a/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java
+++ b/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderPrivateCar.java
@@ -22,6 +22,7 @@
* @since 2020-09-02
*/
@TableName("t_order_private_car")
+
public class TOrderPrivateCar extends Model<TOrderPrivateCar> {
private static final long serialVersionUID = 1L;
@@ -31,6 +32,10 @@
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
+ /**
+ * 异常订单 1是0否
+ */
+ private Integer isException;
/**
* 类型（1=普通订单，2=摆渡订单）
*/
@@ -51,6 +56,7 @@
* 订单号
*/
private String orderNum;
+ private String remark;
/**
* 下单地点经度
*/
@@ -296,9 +302,7 @@
* 是否异常 1=是，0=否
*/
private Integer isAbnormal;
- @ApiModelProperty(value = "是否异常 1=是 0=否")
- @TableField("isException")
- private Integer isException;
+
@ApiModelProperty(value = "修改后的价格")
@TableField("updatePrice")
private BigDecimal updatePrice;
@@ -334,13 +338,7 @@
this.lastPushTime = lastPushTime;
}
- public Integer getIsException() {
- return isException;
- }
- public void setIsException(Integer isException) {
- this.isException = isException;
- }
public BigDecimal getUpdatePrice() {
return updatePrice;
@@ -991,4 +989,20 @@
", serverCarModelId=" + serverCarModelId +
"}";
}
+
+ public Integer getIsException() {
+ return isException;
+ }
+
+ public void setIsException(Integer isException) {
+ this.isException = isException;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
}
--
Gitblit v1.7.1