Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/scheduler/PromotionScheduler.java

@@ -18,9 +18,9 @@
    private final ICouponMemberService couponMemberService;

    /**
     * 每天凌晨定时检查优惠券过期
     * 每小时定时检查优惠券过期
     */
    @Scheduled(cron = "1 0 0 * * ?")
    @Scheduled(cron = "0 0 * * * *")
    private void timingCheckMemberCoupon() {
        log.info("----------------定时检查优惠券过期任务开始执行----------------");
        couponMemberService.timingCheckMemberCoupon();