From 998bc10d74f370f7f99331d9df53d43311949f53 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 14 八月 2025 19:15:12 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
index 63bf04a..8637767 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
@@ -203,6 +203,7 @@
shellList.add("是否推广订单");
shellList.add("推广员姓名");
shellList.add("推广员电话");
+ shellList.add("所属公司");
dataList.add(shellList);
for (Map<String,Object> object : list){
@@ -295,11 +296,6 @@
shellList.add("-");
}
- if(SinataUtil.isNotEmpty(object.get("contactPersonPhone"))){
- shellList.add(object.get("contactPersonPhone").toString());
- }else{
- shellList.add("-");
- }
if(SinataUtil.isNotEmpty(object.get("startAddress"))){
shellList.add(object.get("startAddress").toString());
@@ -409,6 +405,11 @@
}else{
shellList.add("-");
}
+ if(SinataUtil.isNotEmpty(object.get("companyName"))){
+ shellList.add(object.get("companyName").toString());
+ }else{
+ shellList.add("-");
+ }
dataList.add(shellList);
--
Gitblit v1.7.1