From 0001861cc63fc670646a103284b9eaefb193e91f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 10 八月 2024 17:31:48 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java
index ce5f33c..25b1572 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java
@@ -241,14 +241,16 @@
@ResponseBody
public Object add(String staTime, String startTime, String num1, Double num2
, Double num3
- , Integer num4
+ , String num4
, Double num5
, Integer num6
, Double num7
, Integer num8
, Double num9
, Integer num10
- , Double num11) {
+ , Double num11
+ , String num12
+ ) {
driverActivityService.insertOrUpdate(null,staTime,startTime, num1, num2
, num3
@@ -259,7 +261,8 @@
, num8
, num9
, num10
- , num11);
+ , num11
+ , num12);
return SUCCESS_TIP;
}
@@ -280,14 +283,16 @@
@ResponseBody
public Object update(Integer id,String staTime, String startTime, String num1, Double num2
, Double num3
- , Integer num4
+ , String num4
, Double num5
, Integer num6
, Double num7
, Integer num8
, Double num9
, Integer num10
- , Double num11) {
+ , Double num11
+ , String num12
+ ) {
driverActivityService.insertOrUpdate(id,staTime,startTime, num1, num2
, num3
, num4
@@ -297,7 +302,8 @@
, num8
, num9
, num10
- , num11);
+ , num11
+ ,num12);
return SUCCESS_TIP;
}
@RequestMapping(value = "/updateStatus")
--
Gitblit v1.7.1