Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillAppointmentServiceImpl.java

@@ -56,7 +56,7 @@
                    DelayTaskEnum.AUTOMATIC_CANCEL.getCode() + "-" + byId.getId(),
                    byId.getStartTime().minusMinutes(30), duration.getSeconds(), TimeUnit.SECONDS);
        }catch (Exception e){
            throw new ServiceException("即将开始已无法遇约");

        }

        GoodsSeckillAppointment goodsSeckillAppointment=new GoodsSeckillAppointment();