From 8dd61e711d7cccd7d8d1278ab79a73e7a41aad4d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 01 二月 2024 08:50:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/IOrderCharteredCarService.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/IOrderCharteredCarService.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/IOrderCharteredCarService.java
index dbe6b1e..1c8e2c1 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/IOrderCharteredCarService.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/IOrderCharteredCarService.java
@@ -26,7 +26,7 @@
      * @throws Exception
      */
     ResultUtil orderCharteredCar(Date travelTime, Integer carTime, Integer serverCarModelId, String modelUse, Integer peopleNumber,
-                                 String contactPerson, String contactPhone, String placeLonLat, Integer uid) throws Exception;
+                                 String contactPerson, String contactPhone, String placeLonLat, Integer uid, Integer language) throws Exception;
 
 
 
@@ -38,7 +38,7 @@
      * @return
      * @throws Exception
      */
-    List<Map<String, Object>> queryMyOrderList(Integer uid, Integer pageNum, Integer size) throws Exception;
+    List<Map<String, Object>> queryMyOrderList(Integer language, Integer uid, Integer pageNum, Integer size) throws Exception;
 
 
 
@@ -51,7 +51,7 @@
      * @param uid
      * @throws Exception
      */
-    ResultUtil addCancle(Integer id, String reason, String remark, Integer uid) throws Exception;
+    ResultUtil addCancle(Integer id, String reason, String remark, Integer uid, Integer language) throws Exception;
 
 
 

--
Gitblit v1.7.1