Merge remote-tracking branch 'origin/master'

puzhibing

2023-12-12 862c693ff45bac0dca1f146a03f9c37ff30c1e91

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverService.java

@@ -278,7 +278,7 @@
     * @return
     * @throws Exception
     */
    List<Map<String, Object>> queryHistory(Integer uid, Integer pageNum, Integer size) throws Exception;
    List<Map<String, Object>> queryHistory(Integer language, Integer uid, Integer pageNum, Integer size) throws Exception;


    /**