From 1c14ed902b327f8add38dac4311acd2894aea5e1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 04 八月 2025 10:47:18 +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