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

无关风月

2025-09-04 f4c8c73bc5181b6d3265c6a0ce19ae13c600baa3

 UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/DriverMapper.java

@@ -27,6 +27,15 @@
     */
    List<Driver> queryIdleDriver_(@Param("type") Integer type, @Param("serverCarModelId") Integer serverCarModelId,
                                 @Param("companyId") Integer companyId);
    /**
     * 获取当前已上班type业务类型、设置了可以接此类型的单据、服务车型匹配且空闲的司机
     * @param type
     * @param serverCarModelId
     * @param companyId
     * @return
     */
    List<Driver> queryIdleDriverService_(@Param("type") Integer type, @Param("serverCarModelId") Integer serverCarModelId,
                                 @Param("companyId") Integer companyId);


    /**