From 0fc5865ab5f1df62cb948fbb97c2207b5bd855f9 Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期四, 31 七月 2025 21:26:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CancleOrderServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CancleOrderServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CancleOrderServiceImpl.java
index e2ebe75..c7d8794 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CancleOrderServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/CancleOrderServiceImpl.java
@@ -24,7 +24,7 @@
* @throws Exception
*/
@Override
- public CancleOrder query(Integer type, Integer orderType, Integer companyId) throws Exception {
- return cancleOrderMapper.query(type, orderType, companyId);
+ public CancleOrder query(Integer type, Integer orderType, Integer openCityId) throws Exception {
+ return cancleOrderMapper.query(type, orderType, openCityId);
}
}
--
Gitblit v1.7.1