From 729a5a0592cac7750e8b476c5fcb25bfc3ff8d25 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期日, 27 七月 2025 09:06:31 +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/system/model/PushOrder.java |  223 +++++++++++++++++++++++++++++--------------------------
 1 files changed, 118 insertions(+), 105 deletions(-)

diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/PushOrder.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/PushOrder.java
index 64df32c..2da7315 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/PushOrder.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/PushOrder.java
@@ -10,109 +10,122 @@
  */
 @TableName("t_sys_push_order")
 public class PushOrder {
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    @TableField("id")
-    private Integer id;
-    /**
-     * 企业id
-     */
-    @TableField("companyId")
-    private Integer companyId;
-    /**
-     * 推单距离(公里)
-     */
-    @TableField("pushDistance")
-    private Double pushDistance;
-    /**
-     * 推单时间(秒)
-     */
-    @TableField("pushTime")
-    private Integer pushTime;
-    /**
-     * 推单占所有司机百分比
-     */
-    @TableField("driverProportion")
-    private Double driverProportion;
-    /**
-     * 推单次数(1=第一轮,2=第二轮,3=第三轮)
-     */
-    @TableField("type")
-    private Integer type;
-    /**
-     * 推单单据类型(1=专车,2=出租车)
-     */
-    @TableField("pushType")
-    private Integer pushType;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getCompanyId() {
-        return companyId;
-    }
-
-    public void setCompanyId(Integer companyId) {
-        this.companyId = companyId;
-    }
-
-    public Double getPushDistance() {
-        return pushDistance;
-    }
-
-    public void setPushDistance(Double pushDistance) {
-        this.pushDistance = pushDistance;
-    }
-
-    public Integer getPushTime() {
-        return pushTime;
-    }
-
-    public void setPushTime(Integer pushTime) {
-        this.pushTime = pushTime;
-    }
-
-    public Double getDriverProportion() {
-        return driverProportion;
-    }
-
-    public void setDriverProportion(Double driverProportion) {
-        this.driverProportion = driverProportion;
-    }
-
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
-    public Integer getPushType() {
-        return pushType;
-    }
-
-    public void setPushType(Integer pushType) {
-        this.pushType = pushType;
-    }
-
-    @Override
-    public String toString() {
-        return "PushOrder{" +
-                "id=" + id +
-                ", companyId=" + companyId +
-                ", pushDistance=" + pushDistance +
-                ", pushTime=" + pushTime +
-                ", driverProportion=" + driverProportion +
-                ", type=" + type +
-                ", pushType=" + pushType +
-                '}';
-    }
+	/**
+	 * 主键
+	 */
+	@TableId(value = "id", type = IdType.AUTO)
+	@TableField("id")
+	private Integer id;
+	/**
+	 * 企业id
+	 */
+	@TableField("companyId")
+	private Integer companyId;
+	/**
+	 * 开通城市id
+	 */
+	@TableField("openCityId")
+	private Integer openCityId;
+	/**
+	 * 推单距离(公里)
+	 */
+	@TableField("pushDistance")
+	private Double pushDistance;
+	/**
+	 * 推单时间(秒)
+	 */
+	@TableField("pushTime")
+	private Integer pushTime;
+	/**
+	 * 推单占所有司机百分比
+	 */
+	@TableField("driverProportion")
+	private Double driverProportion;
+	/**
+	 * 推单次数(1=第一轮,2=第二轮,3=第三轮)
+	 */
+	@TableField("type")
+	private Integer type;
+	/**
+	 * 推单单据类型(1=专车,2=出租车)
+	 */
+	@TableField("pushType")
+	private Integer pushType;
+	
+	public Integer getId() {
+		return id;
+	}
+	
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	
+	public Integer getCompanyId() {
+		return companyId;
+	}
+	
+	public void setCompanyId(Integer companyId) {
+		this.companyId = companyId;
+	}
+	
+	public Integer getOpenCityId() {
+		return openCityId;
+	}
+	
+	public void setOpenCityId(Integer openCityId) {
+		this.openCityId = openCityId;
+	}
+	
+	public Double getPushDistance() {
+		return pushDistance;
+	}
+	
+	public void setPushDistance(Double pushDistance) {
+		this.pushDistance = pushDistance;
+	}
+	
+	public Integer getPushTime() {
+		return pushTime;
+	}
+	
+	public void setPushTime(Integer pushTime) {
+		this.pushTime = pushTime;
+	}
+	
+	public Double getDriverProportion() {
+		return driverProportion;
+	}
+	
+	public void setDriverProportion(Double driverProportion) {
+		this.driverProportion = driverProportion;
+	}
+	
+	public Integer getType() {
+		return type;
+	}
+	
+	public void setType(Integer type) {
+		this.type = type;
+	}
+	
+	public Integer getPushType() {
+		return pushType;
+	}
+	
+	public void setPushType(Integer pushType) {
+		this.pushType = pushType;
+	}
+	
+	@Override
+	public String toString() {
+		return "PushOrder{" +
+				"id=" + id +
+				", companyId=" + companyId +
+				", pushDistance=" + pushDistance +
+				", pushTime=" + pushTime +
+				", driverProportion=" + driverProportion +
+				", type=" + type +
+				", pushType=" + pushType +
+				'}';
+	}
 }

--
Gitblit v1.7.1