From 736ab0090700c75af37b8a3456b01609e4e2d329 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 17 七月 2024 11:09:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CancleOrderMapper.java |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CancleOrderMapper.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CancleOrderMapper.java
index 178b7c5..6a642a0 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CancleOrderMapper.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CancleOrderMapper.java
@@ -9,10 +9,7 @@
 
     /**
      * 获取取消订单配置
-     * @param type
-     * @param orderType
      * @return
      */
-    CancleOrder query(@Param("type") Integer type, @Param("orderType") Integer orderType,
-                      @Param("companyId") Integer companyId);
+    CancleOrder query(@Param("companyId") Integer companyId);
 }

--
Gitblit v1.7.1