From f4c8c73bc5181b6d3265c6a0ce19ae13c600baa3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 04 九月 2025 12:07:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderListWarpper.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderListWarpper.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderListWarpper.java
index b94e971..ccd990d 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderListWarpper.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderListWarpper.java
@@ -37,9 +37,19 @@
private String cargoNumber;
@ApiModelProperty("备注")
private String remark;
+ @ApiModelProperty("是否预约单")
+ private Integer reservation;
@ApiModelProperty("支付方式（1=OK平台支付（线上支付），2=其他方式支付（线下支付））")
private Integer payManner;
private Long travelTime;
+
+ public Integer getReservation() {
+ return reservation;
+ }
+
+ public void setReservation(Integer reservation) {
+ this.reservation = reservation;
+ }
public Integer getId() {
return id;
@@ -200,6 +210,7 @@
orderListWarpper.setRemark(null != map.get("remark") ? String.valueOf(map.get("remark")) : "");
orderListWarpper.setPayManner(null != map.get("payManner") ? Integer.valueOf(String.valueOf(map.get("payManner"))) : 0);
orderListWarpper.setTravelTime(null != map.get("travelTime") ? Long.valueOf(String.valueOf(map.get("travelTime"))) : 0);
+ orderListWarpper.setReservation(null != map.get("reservation") ? Integer.valueOf(String.valueOf(map.get("reservation"))) : 0);
list.add(orderListWarpper);
}
}
--
Gitblit v1.7.1