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

luodangjia

2024-07-24 38470a0317c44220f371ef96a4a1b935ac16bdc0

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityService.java

@@ -34,7 +34,7 @@

    void insertOrUpdate(Integer id,String staTime, String startTime, String num1, Double num2
            , Double num3
            , Integer num4
            , String num4
            , Double num5
            , Integer num6
            , Double num7