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/system/service/IDriverOrdersService.java

@@ -14,7 +14,7 @@
     * @param type
     * @throws Exception
     */
    ResultUtil updateOrders(Integer uid, Integer type) throws Exception;
    ResultUtil updateOrders(Integer uid, Integer type, Integer language) throws Exception;


    /**