Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-08-04 1c14ed902b327f8add38dac4311acd2894aea5e1

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java

@@ -222,6 +222,8 @@
            orderTaxi.setPromotionUser(driver1.getName());
            orderTaxi.setPromotionPhone(driver1.getPhone());
            orderTaxi.setPromotionDriverId(promotion);
        }else{
            orderTaxi.setPromotion(1);
        }
        
        if(null == oldDriverId){