Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-07-26 0b5d21c6338bb3bd094a5bf2379001c4e9772eb5

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml

@@ -258,7 +258,12 @@
      h.reason as cancelReason,
      h.remark as cancelRemark,
      a.holidayFee,
      a.discountAmount as taxiCardMoney
      a.discountAmount as taxiCardMoney,
        a.responsibilityType,
        a.abnormalStatus,
        a.abnormalRemark,
        a.abnormalIntro,
        a.abnormalImg
        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)