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

无关风月

2025-08-05 9cf6d184a1b8a3a2a951a6842a586906747d46cd

 UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/OrderPrivateCarMapper.java

@@ -95,5 +95,5 @@
     * @param state
     * @return
     */
    List<OrderPrivateCar> queryOrderByState(@Param("driverIds")List<Integer> driverIds, Integer orderType, @Param("state") Integer...state);
    List<OrderPrivateCar> queryOrderByState(@Param("driverIds")List<Integer> driverIds, @Param("orderType") Integer orderType, @Param("state") Integer...state);
}