From 73b750200f25df08aa64124da49e7461f9de6653 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 15:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel
---
ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCharteredCarMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCharteredCarMapper.xml b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCharteredCarMapper.xml
index 13208e0..b4e1941 100644
--- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCharteredCarMapper.xml
+++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderCharteredCarMapper.xml
@@ -34,10 +34,12 @@
ui.phone as userPhone,
oc.* ,
sc.`name` as serverCarModel,
- sc.price as price
+ cs.serviceMoney as price,
+ cs.`serviceName` as serviceName
FROM t_order_chartered_car as oc
LEFT JOIN t_user as ui on ui.id = oc.userId
LEFT JOIN t_server_carmodel as sc on (oc.serverCarModelId = sc.id)
+ left join t_chartered_service as cs on (oc.serviceId = cs.id)
) as o
<where>
o.isDelete = 1
--
Gitblit v1.7.1