From 9cf6d184a1b8a3a2a951a6842a586906747d46cd Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 05 八月 2025 20:56:43 +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 |   78 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 78 insertions(+), 0 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 40213bd..357f65f 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
@@ -1,11 +1,16 @@
 package com.stylefeng.guns.modular.system.model;
 
+import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.enums.IdType;
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.Date;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+
 import java.io.Serializable;
 
 /**
@@ -17,6 +22,7 @@
  * @since 2020-09-02
  */
 @TableName("t_order_private_car")
+
 public class TOrderPrivateCar extends Model<TOrderPrivateCar> {
 
     private static final long serialVersionUID = 1L;
@@ -26,6 +32,10 @@
      */
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
+    /**
+     * 异常订单 1是0否
+     */
+    private Integer isException;
     /**
      * 类型（1=普通订单，2=摆渡订单）
      */
@@ -292,6 +302,66 @@
      */
     private Integer isAbnormal;
 
+    @ApiModelProperty(value = "修改后的价格")
+    @TableField("updatePrice")
+    private BigDecimal updatePrice;
+    @ApiModelProperty(value = "价格类型 1=原价格 2=预估价 3=修改价")
+    @TableField("priceType")
+    private Integer priceType;
+    @ApiModelProperty(value = "预估价")
+    @TableField("estimatedPrice")
+    private BigDecimal estimatedPrice;
+
+    @ApiModelProperty(value = "上一次定位推送时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField("lastPushTime")
+    private LocalDateTime lastPushTime;
+
+    @ApiModelProperty(value = "修改价格审核 1=待审核 2=通过")
+    @TableField("priceAuditState")
+    private Integer priceAuditState;
+
+    public Integer getPriceAuditState() {
+        return priceAuditState;
+    }
+
+    public void setPriceAuditState(Integer priceAuditState) {
+        this.priceAuditState = priceAuditState;
+    }
+
+    public LocalDateTime getLastPushTime() {
+        return lastPushTime;
+    }
+
+    public void setLastPushTime(LocalDateTime lastPushTime) {
+        this.lastPushTime = lastPushTime;
+    }
+
+
+
+    public BigDecimal getUpdatePrice() {
+        return updatePrice;
+    }
+
+    public void setUpdatePrice(BigDecimal updatePrice) {
+        this.updatePrice = updatePrice;
+    }
+
+    public Integer getPriceType() {
+        return priceType;
+    }
+
+    public void setPriceType(Integer priceType) {
+        this.priceType = priceType;
+    }
+
+    public BigDecimal getEstimatedPrice() {
+        return estimatedPrice;
+    }
+
+    public void setEstimatedPrice(BigDecimal estimatedPrice) {
+        this.estimatedPrice = estimatedPrice;
+    }
     public Integer getIsAbnormal() {
         return isAbnormal;
     }
@@ -918,4 +988,12 @@
         ", serverCarModelId=" + serverCarModelId +
         "}";
     }
+
+    public Integer getIsException() {
+        return isException;
+    }
+
+    public void setIsException(Integer isException) {
+        this.isException = isException;
+    }
 }

--
Gitblit v1.7.1