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/ICancleOrderService.java

@@ -9,10 +9,8 @@

    /**
     * 获取取消订单设置
     * @param type
     * @param orderType
     * @return
     * @throws Exception
     */
    CancleOrder query(Integer type, Integer orderType, Integer companyId) throws Exception;
    CancleOrder query(Integer companyId) throws Exception;
}