From f6fd3607f046744e86f391956d91d0f009bb3adb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 18 八月 2025 22:50:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderServerWarpper.java | 70 +++++++++++++++++++++++++++++++++++
1 files changed, 70 insertions(+), 0 deletions(-)
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderServerWarpper.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderServerWarpper.java
index a1432a7..c1541c3 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderServerWarpper.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderServerWarpper.java
@@ -29,6 +29,68 @@
private Integer state;
@ApiModelProperty("订单改派状态（0=未改派，1=改派中，2=已改派）")
private Integer reassignNotice;
+ @ApiModelProperty("开始纬度")
+ private String startLat;
+ @ApiModelProperty("开始经度")
+ private String startLon;
+ @ApiModelProperty("结束纬度")
+ private String nextLatitude;
+ @ApiModelProperty("结束经度")
+ private String nextLongitude;
+ @ApiModelProperty("结束纬度")
+ private String endLat;
+ @ApiModelProperty("结束经度")
+ private String endLon;
+ @ApiModelProperty("计费方式（1=线上计费，2=线下计费）")
+ private Integer payManner;
+
+ public String getEndLat() {
+ return endLat;
+ }
+
+ public void setEndLat(String endLat) {
+ this.endLat = endLat;
+ }
+
+ public String getEndLon() {
+ return endLon;
+ }
+
+ public void setEndLon(String endLon) {
+ this.endLon = endLon;
+ }
+
+ public String getStartLat() {
+ return startLat;
+ }
+
+ public void setStartLat(String startLat) {
+ this.startLat = startLat;
+ }
+
+ public String getStartLon() {
+ return startLon;
+ }
+
+ public void setStartLon(String startLon) {
+ this.startLon = startLon;
+ }
+
+ public String getNextLatitude() {
+ return nextLatitude;
+ }
+
+ public void setNextLatitude(String nextLatitude) {
+ this.nextLatitude = nextLatitude;
+ }
+
+ public String getNextLongitude() {
+ return nextLongitude;
+ }
+
+ public void setNextLongitude(String nextLongitude) {
+ this.nextLongitude = nextLongitude;
+ }
public Integer getOrderId() {
return orderId;
@@ -125,4 +187,12 @@
public void setReassignNotice(Integer reassignNotice) {
this.reassignNotice = reassignNotice;
}
+
+ public Integer getPayManner() {
+ return payManner;
+ }
+
+ public void setPayManner(Integer payManner) {
+ this.payManner = payManner;
+ }
}
--
Gitblit v1.7.1