From ddba15cfd1d654dc41de5dfdc587e12d96d84f4f Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 04 八月 2025 17:44:54 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java
index 456478e..021936b 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
-import com.stylefeng.guns.modular.system.model.BaseBean;
import java.math.BigDecimal;
import java.util.Date;
@@ -344,6 +343,8 @@
private String splitAllocation;
+
+ private Integer promotion;
// 推广应的金额
private BigDecimal promotionMoney;
@@ -351,6 +352,47 @@
private Integer promotionDriverId;
private String voice;
+
+
+ private Date voiceTime;
+
+ private String promotionUser;
+
+ private String promotionPhone;
+
+ private String travelId;
+
+
+ public String getPromotionUser() {
+ return promotionUser;
+ }
+
+ public void setPromotionUser(String promotionUser) {
+ this.promotionUser = promotionUser;
+ }
+
+ public String getPromotionPhone() {
+ return promotionPhone;
+ }
+
+ public void setPromotionPhone(String promotionPhone) {
+ this.promotionPhone = promotionPhone;
+ }
+ public Integer getPromotion() {
+ return promotion;
+ }
+
+ public void setPromotion(Integer promotion) {
+ this.promotion = promotion;
+ }
+
+ public Date getVoiceTime() {
+ return voiceTime;
+ }
+
+ public void setVoiceTime(Date voiceTime) {
+ this.voiceTime = voiceTime;
+ }
public String getVoice() {
return voice;
@@ -904,7 +946,15 @@
public void setSplitAllocation(String splitAllocation) {
this.splitAllocation = splitAllocation;
}
-
+
+ public String getTravelId() {
+ return travelId;
+ }
+
+ public void setTravelId(String travelId) {
+ this.travelId = travelId;
+ }
+
@Override
public String toString() {
return "OrderTaxi{" +
--
Gitblit v1.7.1