From 26079aa3c34f47e952a9538a93d6f8a3bab9a0fc Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 23 八月 2024 09:12:44 +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 |    4 ++--
 1 files changed, 2 insertions(+), 2 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 4ffda7d..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,7 +241,7 @@
     @ResponseBody
     public Object add(String staTime, String startTime, String num1, Double num2
             , Double num3
-            , Integer num4
+            , String num4
             , Double num5
             , Integer num6
             , Double num7
@@ -283,7 +283,7 @@
     @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

--
Gitblit v1.7.1