Merge remote-tracking branch 'origin/master'

guyue

2025-08-01 ba165ef7ca1573df70dc66b786da6be4eb60380b

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ICancleOrderService.java

@@ -14,5 +14,5 @@
     * @return
     * @throws Exception
     */
    CancleOrder query(Integer type, Integer orderType, Integer companyId) throws Exception;
    CancleOrder query(Integer type, Integer orderType, Integer openCityId) throws Exception;
}