Merge remote-tracking branch 'origin/2.0' into 2.0

puzhibing

2024-05-06 7c26ec693561ecce9fba31ab4e83e9f30d641aad

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

@@ -104,7 +104,8 @@
            endAddress as endAddress,
            state as state,
            orderType as reservation,
            driverId as driverId
            driverId as driverId,
            isFrozen
            from t_order_private_car where 1 = 1
            <if test="null != driverId">
                and driverId = #{driverId}
@@ -122,7 +123,8 @@
            endAddress as endAddress,
            state as state,
            orderType as reservation,
            driverId as driverId
            driverId as driverId,
            isFrozen
            from t_order_private_car where 1 = 1
            <if test="null != driverId">
                and driverId = #{driverId}
@@ -139,7 +141,8 @@
            endAddress as endAddress,
            state as state,
            orderType as reservation,
            driverId as driverId
            driverId as driverId,
            isFrozen
            from t_order_private_car where 1 = 1
            <if test="null != driverId">
                and driverId = #{driverId}