From 796dc4887bfc37eb29e5ac6c4737e51ff7ab4299 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期一, 12 八月 2024 11:41:46 +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/service/IDriverActivityService.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityService.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityService.java
index eefcc58..3925f23 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityService.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityService.java
@@ -34,12 +34,14 @@
 
     void insertOrUpdate(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
+    );
 }

--
Gitblit v1.7.1