From f78a1ad6fd6c0d70f33dd2edc6170104e9ed6429 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期日, 27 七月 2025 13:56:34 +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/taxi/model/OrderTaxi.java |   66 +++++++++++++++++++++++++++++++++
 1 files changed, 66 insertions(+), 0 deletions(-)

diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java
index e79651a..137f696 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java
@@ -6,6 +6,7 @@
 import com.baomidou.mybatisplus.enums.IdType;
 import com.stylefeng.guns.modular.system.model.BaseBean;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -356,8 +357,73 @@
     @TableField("bindId")
     private String bindId;
 
+    /**
+     * 是否异常订单 1否 2是
+     */
+    @TableField("abnormal")
+    private Integer abnormal;
+
+
+    /**
+     * 乘客反馈情况
+     */
+    @TableField("abnormalIntro")
+    private String abnormalIntro;
+
+    /**
+     * 乘客反馈图片
+     */
+    @TableField("abnormalImg")
+    private String abnormalImg;
+
+
+    private Integer promotionDriverId;
+
+    private BigDecimal promotionMoney;
+
+
     private String splitAllocation;
 
+    public Integer getPromotionDriverId() {
+        return promotionDriverId;
+    }
+
+    public void setPromotionDriverId(Integer promotionDriverId) {
+        this.promotionDriverId = promotionDriverId;
+    }
+
+    public BigDecimal getPromotionMoney() {
+        return promotionMoney;
+    }
+
+    public void setPromotionMoney(BigDecimal promotionMoney) {
+        this.promotionMoney = promotionMoney;
+    }
+
+    public Integer getAbnormal() {
+        return abnormal;
+    }
+
+    public void setAbnormal(Integer abnormal) {
+        this.abnormal = abnormal;
+    }
+
+    public String getAbnormalIntro() {
+        return abnormalIntro;
+    }
+
+    public void setAbnormalIntro(String abnormalIntro) {
+        this.abnormalIntro = abnormalIntro;
+    }
+
+    public String getAbnormalImg() {
+        return abnormalImg;
+    }
+
+    public void setAbnormalImg(String abnormalImg) {
+        this.abnormalImg = abnormalImg;
+    }
+
     public Integer getId() {
         return id;
     }

--
Gitblit v1.7.1