From 92480c7fd17a6bf89205ffcf4b78eef17988f0d5 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期五, 01 八月 2025 19:22:11 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ICancleOrderService.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ICancleOrderService.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ICancleOrderService.java index 6c283b2..5f91734 100644 --- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ICancleOrderService.java +++ b/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; } -- Gitblit v1.7.1