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/impl/DriverActivityServiceImpl.java

@@ -53,7 +53,7 @@

    @Override
    public void insertOrUpdate(Integer id, String staTime, String startTime,
                               String num1, Double num2, Double num3, Integer num4,
                               String num1, Double num2, Double num3, String num4,
                               Double num5, Integer num6, Double num7, Integer num8,
                               Double num9, Integer num10, Double num11,String num12) {
        //判断id是否为空，为空执行添加，或者执行修改