From a139dba9262dbb4b70f34d3c2034c255561abcad Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 26 七月 2025 18:04:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml
index ad83c2e..da859a5 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml
@@ -263,7 +263,8 @@
a.abnormalStatus,
a.abnormalRemark,
a.abnormalIntro,
- a.abnormalImg
+ a.abnormalImg,
+ a.companyId
from t_order_taxi a
left join t_driver b on (a.driverId = b.id)
left join t_car c on (a.carId = c.id)
--
Gitblit v1.7.1