From 0fc5865ab5f1df62cb948fbb97c2207b5bd855f9 Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期四, 31 七月 2025 21:26:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 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..53706e5 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
@@ -344,6 +344,8 @@
private String splitAllocation;
+
+ private Integer promotion;
// 推广应的金额
private BigDecimal promotionMoney;
@@ -352,6 +354,45 @@
private String voice;
+
+ private Date voiceTime;
+
+ private String promotionUser;
+
+ private String promotionPhone;
+
+
+ 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;
}
--
Gitblit v1.7.1