From 0c41f99c7f1a0d7deeeef23a5b3b890aed32ce63 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 16 八月 2025 09:20:50 +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/warpper/OrderInfoWarpper.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
index 2efdd58..deb83d6 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
@@ -169,7 +169,7 @@
@ApiModelProperty("申诉按钮 1显示 0不显示")
- private Integer appealButton=0;
+ private Integer appealButton=1;
@ApiModelProperty("申诉状态 0未申诉 1申诉中")
private Integer appealStatus=0;
@@ -186,6 +186,17 @@
@ApiModelProperty("1平台全责 2司机全责 3乘客全责 4平台部分 5司机部分")
private String responsibilityType;
+
+ @ApiModelProperty("公司名称")
+ private String companyName;
+
+ public String getCompanyName() {
+ return companyName;
+ }
+
+ public void setCompanyName(String companyName) {
+ this.companyName = companyName;
+ }
public Integer getAbnormalStatus() {
return abnormalStatus;
@@ -1056,6 +1067,14 @@
orderInfoWarpper.setLineShiftTime(null != map.get("lineShiftTime") ? map.get("lineShiftTime").toString() : "");
orderInfoWarpper.setHolidayFee(null != map.get("holidayFee") ? Double.valueOf(map.get("holidayFee").toString()) : 0);
orderInfoWarpper.setTaxiCardMoney(null != map.get("taxiCardMoney") ? Double.valueOf(map.get("taxiCardMoney").toString()) : 0);
+ orderInfoWarpper.setAppealButton(null != map.get("appealButton") ? Integer.valueOf(map.get("appealButton").toString()) : 0);
+ orderInfoWarpper.setAppealStatus(null != map.get("appealStatus") ? Integer.valueOf(map.get("appealStatus").toString()) : 0);
+ orderInfoWarpper.setAbnormalStatus(Integer.valueOf(map.get("abnormalStatus").toString()));
+ orderInfoWarpper.setAbnormalRemark(null != map.get("abnormalRemark") ? map.get("abnormalRemark").toString() : "");
+ orderInfoWarpper.setAbnormalIntro(null != map.get("abnormalIntro") ? map.get("abnormalIntro").toString() : "");
+ orderInfoWarpper.setAbnormalImg(null != map.get("abnormalImg") ? map.get("abnormalImg").toString() : "");
+ orderInfoWarpper.setResponsibilityType(null != map.get("responsibilityType") ? map.get("responsibilityType").toString() : null);
+ orderInfoWarpper.setCompanyName(null != map.get("companyName") ? map.get("companyName").toString() : null);
orderInfoWarpper.setOrderAdditionalFeeWarpper(list);
}
return orderInfoWarpper;
--
Gitblit v1.7.1