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

zhibing.pu

2024-05-06 0045a8fdf5525a385c233c3b82e42f6120021cac

 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;
}