Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-07-26 0b5d21c6338bb3bd094a5bf2379001c4e9772eb5

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml

@@ -385,7 +385,12 @@
      a.waitRule,
      a.chargeRule,
      a.chargeRules,
      a.discountAmount as taxiCardMoney
      a.discountAmount as taxiCardMoney,
      a.responsibilityType,
      a.abnormalStatus,
      a.abnormalRemark,
      a.abnormalIntro,
      a.abnormalImg
        from t_order_private_car a
      left join t_driver b on (a.driverId = b.id)
      left join t_car c on (a.carId = c.id)