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

luo

2024-01-30 cf487b4baf05048e8929b47d73efc83d6a09162c

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IOrderCancelService.java

@@ -44,5 +44,5 @@
     * @return
     * @throws Exception
     */
    List<Map<String, Object>> queryCancel(Integer uid, Integer isPay) throws Exception;
    List<Map<String, Object>> queryCancel(Integer language, Integer uid, Integer isPay) throws Exception;
}