From 8580866e175ad0050ee9c5ea3f757856fc242c39 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 09 五月 2025 10:50:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
index 93ef99e..0aa0758 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
@@ -123,6 +123,16 @@
private String cancelRemark;
@ApiModelProperty("备注")
private String remark;
+ @ApiModelProperty("1=线上 2=打表")
+ private Integer payManner;
+
+ public Integer getPayManner() {
+ return payManner;
+ }
+
+ public void setPayManner(Integer payManner) {
+ this.payManner = payManner;
+ }
public Integer getOrderId() {
return orderId;
@@ -710,6 +720,7 @@
orderInfoWarpper.setEndCity(null != map.get("endCity") ? map.get("endCity").toString() : "");
orderInfoWarpper.setRemark(null != map.get("remark") ? map.get("remark").toString() : "");
orderInfoWarpper.setLineShiftTime(null != map.get("lineShiftTime") ? map.get("lineShiftTime").toString() : "");
+ orderInfoWarpper.setPayManner(null != map.get("payManner") ? Integer.valueOf(map.get("payManner").toString()) : 1);
}
return orderInfoWarpper;
}
--
Gitblit v1.7.1