Merge remote-tracking branch 'origin/master'

Pu Zhibing

8 天以前 a139dba9262dbb4b70f34d3c2034c255561abcad

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml

@@ -354,7 +354,8 @@
        a.abnormalStatus,
        a.abnormalRemark,
        a.abnormalIntro,
        a.abnormalImg
        a.abnormalImg,
        a.companyId
        from t_order_cross_city a
      left join t_driver b on (a.driverId = b.id)
      left join t_car c on (a.carId = c.id)