Merge remote-tracking branch 'origin/2.0' into 2.0

luodangjia

2024-07-17 40bc5a67fe0fa6a01711b7b7a12e38a6272510a8

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java

@@ -250,7 +250,6 @@
            , Integer num10
            , Double num11
            , String num12

    ) {

        driverActivityService.insertOrUpdate(null,staTime,startTime,  num1,  num2